审批人等待审核获取信息接口修改

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

@@ -82,6 +82,9 @@ public class ExamineApiController {
     @Autowired
     private ProcinstActUserService procinstActUserService;
 
+    @Autowired
+    private YearRequestForLeaveInfoService yearRequestForLeaveInfoService;
+
 
 
     @ApiOperation(value = "根据登录人查询待审核的调班记录")
@@ -204,6 +207,15 @@ public class ExamineApiController {
                                 examineShiftListDTO.setName(personInfo1.getName());
                             }
                         }
+                        if ("11".equals(procinst.getType())){
+                            YearRequestForLeaveInfo yearRequestForLeaveInfo = yearRequestForLeaveInfoService.get(procinst.getBusinessKey());
+
+                            if(yearRequestForLeaveInfo!=null) {
+                                PersonPopedom personPopedom1 = personPopedomService.findByIdIgnoreDel(yearRequestForLeaveInfo.getPersonPopedomId());
+                                PersonInfo personInfo1 = personInfoService.findByIdIgnoreDel(personPopedom1.getPersonId());
+                                examineShiftListDTO.setName(personInfo1.getName());
+                            }
+                        }
                         list.add(examineShiftListDTO);
 
                     }
@@ -368,6 +380,27 @@ public class ExamineApiController {
                         }
                     }
 
+                    //年假
+                    if ("11".equals(procinstType)){
+                        YearRequestForLeaveInfo yearRequestForLeaveInfo = yearRequestForLeaveInfoService.get(procinst.getBusinessKey());
+
+                        if(yearRequestForLeaveInfo!=null) {
+                            PersonInfo personInfo1 = personInfoService.findByIdIgnoreDel(yearRequestForLeaveInfo.getPersonId());
+                            ExamineShiftListDTO examineShiftListDTO = new ExamineShiftListDTO();
+                            examineShiftListDTO.setId(yearRequestForLeaveInfo.getId());
+                            examineShiftListDTO.setProcinstActUserId(procinstActUser.getId());
+                            examineShiftListDTO.setName(personInfo1.getName());
+
+                            examineShiftListDTO.setCreateTime(DateUtil.format(yearRequestForLeaveInfo.getCreateTime(), "yyyy-MM-dd HH:mm"));
+                            examineShiftListDTO.setStartTime(DateUtil.format(yearRequestForLeaveInfo.getStartTime(), "yyyy-MM-dd"));
+                            examineShiftListDTO.setStartTimeQuantum(yearRequestForLeaveInfo.getStartTimeQuantum());
+                            examineShiftListDTO.setEndTime(DateUtil.format(yearRequestForLeaveInfo.getEndTime(), "yyyy-MM-dd"));
+                            examineShiftListDTO.setEndTimeQuantum(yearRequestForLeaveInfo.getEndTimeQuantum());
+
+                            list.add(examineShiftListDTO);
+                        }
+                    }
+
                 }
 
             }
@@ -537,6 +570,16 @@ public class ExamineApiController {
                                 examineShiftListDTO.setActionName(TypeNameUtil.getExamineTypeName(customerDiningRecord.getStatus()));
                             }
                         }
+                        if ("11".equals(procinst.getType())){
+                            YearRequestForLeaveInfo yearRequestForLeaveInfo = yearRequestForLeaveInfoService.get(procinst.getBusinessKey());
+
+                            if(yearRequestForLeaveInfo!=null) {
+                                PersonInfo personInfo1 = personInfoService.get(yearRequestForLeaveInfo.getPersonId());
+                                examineShiftListDTO.setName(personInfo1.getName());
+                                examineShiftListDTO.setAction(yearRequestForLeaveInfo.getStatus().toString());
+                                examineShiftListDTO.setActionName(TypeNameUtil.getExamineTypeName(yearRequestForLeaveInfo.getStatus().toString()));
+                            }
+                        }
 
                         list.add(examineShiftListDTO);
                     }
@@ -714,6 +757,31 @@ public class ExamineApiController {
                             list.add(examineShiftListDTO);
                         }
                     }
+
+
+                    //年假
+                    if ("11".equals(procinstType)){
+                        YearRequestForLeaveInfo yearRequestForLeaveInfo = yearRequestForLeaveInfoService.get(procinst.getBusinessKey());
+
+                        if(yearRequestForLeaveInfo!=null) {
+                            // PersonInfo personInfo1 = personInfoService.get(requestForLeaveInfo.getPersonId());
+                            PersonInfo personInfo1 = personInfoService.findByIdIgnoreDel(yearRequestForLeaveInfo.getPersonId());
+                            ExamineShiftListDTO examineShiftListDTO = new ExamineShiftListDTO();
+                            examineShiftListDTO.setId(yearRequestForLeaveInfo.getId());
+                            examineShiftListDTO.setProcinstActUserId(yearRequestForLeaveInfo.getId());
+                            examineShiftListDTO.setName(personInfo1.getName());
+
+                            examineShiftListDTO.setCreateTime(DateUtil.format(yearRequestForLeaveInfo.getCreateTime(), "yyyy-MM-dd HH:mm"));
+                            examineShiftListDTO.setStartTime(DateUtil.format(yearRequestForLeaveInfo.getStartTime(), "yyyy-MM-dd"));
+                            examineShiftListDTO.setStartTimeQuantum(yearRequestForLeaveInfo.getStartTimeQuantum());
+                            examineShiftListDTO.setEndTime(DateUtil.format(yearRequestForLeaveInfo.getEndTime(), "yyyy-MM-dd"));
+                            examineShiftListDTO.setEndTimeQuantum(yearRequestForLeaveInfo.getEndTimeQuantum());
+                            examineShiftListDTO.setAction(yearRequestForLeaveInfo.getStatus().toString());
+                            examineShiftListDTO.setActionName(TypeNameUtil.getExamineTypeName(yearRequestForLeaveInfo.getStatus().toString()));
+
+                            list.add(examineShiftListDTO);
+                        }
+                    }
                 }
 
             }