合并分支 'gwj' 到 'master'

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

@@ -34,8 +34,11 @@ public class WorkoverAppro {
     @ApiModelProperty(value = "加班的任务名",example = "1")
     private String name;
 
-    @ApiModelProperty(value = "加班组员名单",example = "1")
-    private List<User> groupMenbers;
+    @ApiModelProperty(value = "加班组员名单id集合",example = "1")
+    private List<String> groupMenbers;
+
+    @ApiModelProperty(value = "加班组员名单名字集合",example = "1")
+    private List<String> groupMenberName;
 
     @ApiModelProperty(value = "部门id",example = "1")
     private String departmentId;

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

@@ -7,9 +7,11 @@ import com.zjty.tynotes.attendance.service.ApprovalInformationService;
 import com.zjty.tynotes.pas.dao.ConfigDao;
 import com.zjty.tynotes.pas.dao.DayDao;
 import com.zjty.tynotes.pas.dao.DepartmentDao;
+import com.zjty.tynotes.pas.dao.PasUserDao;
 import com.zjty.tynotes.pas.entity.Config;
 import com.zjty.tynotes.pas.entity.Day;
 import com.zjty.tynotes.pas.entity.Department;
+import com.zjty.tynotes.pas.entity.User;
 import com.zjty.tynotes.pas.entity.vo.PageResponse;
 import com.zjty.tynotes.pas.service.IUserService;
 import org.apache.commons.lang3.StringUtils;
@@ -48,6 +50,8 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
     private UserSickNumDao userSickNumDao;
     @Autowired
     private WorkoverApproDao workoverApproDao;
+    @Autowired
+    private PasUserDao pasUserDao;
 
     @Override
     public ApprovalInformation addApproval(ApprovalInformation approvalInformation) {
@@ -326,7 +330,18 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
      */
     @Override
     public WorkoverAppro addWorkoverApproval(WorkoverAppro workoverAppro) {
+        List<String> groupMenbers = workoverAppro.getGroupMenbers();
+        List<String> names = new ArrayList<>();
+        if(groupMenbers!=null){
+            groupMenbers.forEach(groupMenber ->{
+                Optional<User> optional = pasUserDao.findById(groupMenber);
+                if(optional.isPresent()){
+                    names.add(optional.get().getUsername());
+                }
+            });
+        }
         workoverAppro.setStatus("0");
+        workoverAppro.setGroupMenberName(names);
         workoverAppro.setApplyTime(new Date());
         return workoverApproDao.save(workoverAppro);
     }