年假审批修改状态问题

common/src/main/java/com/jpsoft/shinestar/modules/workflow/service/impl/ProcinstActUserServiceImpl.java

@@ -226,8 +226,7 @@ public class ProcinstActUserServiceImpl implements ProcinstActUserService {
                     	customerDiningRecord = customerDiningRecordService.get(procinst.getBusinessKey());
                         businessStatus = customerDiningRecord.getStatus();
 					}
-
-                    //请假
+                    //年假
                     YearRequestForLeaveInfo yearRequestForLeaveInfo = null;
                     if ("11".equals(procinst.getType())) {
                         yearRequestForLeaveInfo = yearRequestForLeaveInfoService.get(procinst.getBusinessKey());
@@ -863,7 +862,7 @@ public class ProcinstActUserServiceImpl implements ProcinstActUserService {
 								}
 
                                 //年假
-                                if ("3".equals(procinst.getType())) {
+                                if ("11".equals(procinst.getType())) {
                                     yearRequestForLeaveInfo.setStatus(Integer.parseInt(status));
                                     yearRequestForLeaveInfo.setUpdateTime(new Date());
                                     yearRequestForLeaveInfoService.update(yearRequestForLeaveInfo);

web/src/main/java/com/jpsoft/shinestar/modules/base/controller/CanteenOutsourcerBalanceController.java

@@ -429,7 +429,13 @@ public class CanteenOutsourcerBalanceController {
                     }
                 }
 
-                map.put("recordTime",sdf.format(canteenDiningRecord.getRecordTime()));
+                if(canteenDiningRecord.getRecordTime()!=null){
+                    map.put("recordTime",sdf.format(canteenDiningRecord.getRecordTime()));
+                }
+                else{
+                    map.put("recordTime","");
+                }
+
                 map.put("categoryAmount",canteenDiningRecord.getCategoryAmount());
                 map.put("address",canteenDiningRecord.getAddress());
                 map.put("personName",personName);
@@ -505,7 +511,7 @@ public class CanteenOutsourcerBalanceController {
             row.createCell(colIndex++).setCellValue(com.jpsoft.shinestar.modules.common.utils.StringUtils.strValue(map.get("companyName"),""));
             row.createCell(colIndex++).setCellValue(com.jpsoft.shinestar.modules.common.utils.StringUtils.strValue(map.get("jobNumber"),""));
             row.createCell(colIndex++).setCellValue(com.jpsoft.shinestar.modules.common.utils.StringUtils.strValue(map.get("personName"),""));
-            row.createCell(colIndex++).setCellValue(com.jpsoft.shinestar.modules.common.utils.StringUtils.strValue(map.get("createTime"),""));
+            row.createCell(colIndex++).setCellValue(com.jpsoft.shinestar.modules.common.utils.StringUtils.strValue(map.get("recordTime"),""));
             row.createCell(colIndex++).setCellValue(com.jpsoft.shinestar.modules.common.utils.StringUtils.strValue(map.get("categoryName"),""));
             row.createCell(colIndex++).setCellValue(com.jpsoft.shinestar.modules.common.utils.StringUtils.strValue(map.get("categoryAmount"),""));
             row.createCell(colIndex++).setCellValue(com.jpsoft.shinestar.modules.common.utils.StringUtils.strValue(map.get("address"),""));

web/src/main/java/com/jpsoft/shinestar/modules/mobile/controller/AdjustShiftApiController.java

@@ -118,6 +118,8 @@ public class AdjustShiftApiController {
     @Autowired
     private WorkShiftInfoService workShiftInfoService;
 
+    @Autowired
+    private YearRequestForLeaveInfoService yearRequestForLeaveInfoService;
 
     @ApiOperation(value = "根据登录人查询自己的排班")
     @PostMapping(value = "ownerShift")
@@ -526,6 +528,14 @@ public class AdjustShiftApiController {
                 }
             }
 
+            //年假
+            if ("11".equals(procinst.getType())) {
+                YearRequestForLeaveInfo yearRequestForLeaveInfo = yearRequestForLeaveInfoService.get(procinst.getBusinessKey());
+                if (yearRequestForLeaveInfo.getPersonPopedomId().equals(personPopedom.getId()) && yearRequestForLeaveInfo.getStatus().equals("0")) {
+                    ownerSubmit = true;
+                }
+            }
+
 
             //查询当前审核步骤
             ProcinstActivity procinstActivity0 = procinstActivityService.findProcinstIdAndStatus(procinst.getId(), "1");

web/src/main/java/com/jpsoft/shinestar/modules/mobile/controller/YearRequestForLeaveInfoApiController.java

@@ -482,7 +482,7 @@ public class YearRequestForLeaveInfoApiController {
     }
 
 
-    @ApiOperation(value = "年假假审批列表")
+    @ApiOperation(value = "年假审批列表")
     @PostMapping(value = "approvedPageList")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "type", value = "是否处理（0：待处理，1：已处理）", dataType = "int", paramType = "query"),
@@ -615,7 +615,7 @@ public class YearRequestForLeaveInfoApiController {
     }
 
 
-    @ApiOperation(value = "请假审批")
+    @ApiOperation(value = "年假审批")
     @PostMapping(value = "approved")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "请假记录ID", dataType = "String", paramType = "query"),