Merge branch 'master' of git.yfzx.zjtys.com.cn:zjm/notes2.0

notes-attendance/src/main/java/com/zjty/tynotes/attendance/entity/WorkoverAppro.java

@@ -31,6 +31,9 @@ public class WorkoverAppro {
     @ApiModelProperty(value = "加班申请人编号",example = "1")
     private String userId;
 
+    @ApiModelProperty(value = "加班申请人名字",example = "1")
+    private String userName;
+
     @ApiModelProperty(value = "加班的任务名",example = "1")
     private String name;
 
@@ -56,6 +59,9 @@ public class WorkoverAppro {
     @ApiModelProperty(value = "审批人id",example = "1")
     private String auditId;
 
+    @ApiModelProperty(value = "审批人名字",example = "1")
+    private String auditName;
+
     @ApiModelProperty(value = "申请时间",example = "2020-04-03 09:00:00")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date applyTime;

notes-attendance/src/main/java/com/zjty/tynotes/attendance/service/impl/ApprovalInformationServiceImpl.java

@@ -252,6 +252,11 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
         return null;
     }
 
+    /**
+     * 查找所有我审核的审批
+     * @param pageRequest
+     * @return
+     */
     @Override
     public PageResponse<ApprovalInformation> findAllAuditApproval(PageRequestAtten pageRequest) {
         PageResponse<ApprovalInformation> pageResponse = new PageResponse();
@@ -259,6 +264,9 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
         List<String> strings = new ArrayList<>();
         statusList.add("1");
         statusList.add("2");
+
+//        List<ApprovalInformation> approvalInformations1 = approvalInformationDao.findAll();
+
         List<ApprovalInformation> approvalInformations = approvalInformationDao.findAllByStatusIn(statusList);
         List<ApprovalInformation> approvalInformationList = new ArrayList<>();
         if(pageRequest.getId()!=null){
@@ -340,6 +348,10 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
                 }
             });
         }
+        Optional<User> optional = pasUserDao.findById(workoverAppro.getUserId());
+        if(optional.isPresent()){
+            workoverAppro.setUserName(optional.get().getUsername());
+        }
         workoverAppro.setStatus("0");
         workoverAppro.setGroupMenberName(names);
         workoverAppro.setApplyTime(new Date());
@@ -357,6 +369,12 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
     public WorkoverAppro approWorkover(WorkoverAppro workoverAppro, String userId, String status) {
         workoverAppro.setStatus(status);
         workoverAppro.setAuditId(userId);
+        if(userId!=null){
+            Optional<User> optional = pasUserDao.findById(userId);
+            if(optional.isPresent()){
+                workoverAppro.setAuditId(optional.get().getUsername());
+            }
+        }
         return workoverApproDao.save(workoverAppro);
     }