修改用户等

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java

@@ -34,6 +34,7 @@ import com.mortals.xhx.module.staff.dao.ibatis.StaffDaoImpl;
 import com.mortals.xhx.module.staff.dao.ibatis.StaffLeaveDaoImpl;
 import com.mortals.xhx.module.staff.model.StaffEntity;
 import com.mortals.xhx.module.staff.model.StaffLeaveEntity;
+import com.mortals.xhx.module.staff.model.StaffLeaveQuery;
 import com.mortals.xhx.module.staff.model.StaffQuery;
 import com.mortals.xhx.module.staff.model.vo.StaffInfoVo;
 import com.mortals.xhx.module.staff.service.StaffLeaveService;
@@ -154,6 +155,7 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
                 }
                 if (staffCollect.containsKey(personInfo.getJobNo())) {
                     staffCollect.remove(personInfo.getJobNo());
+
                 }
 
                 StaffEntity staffEntity = this.getExtCache(StrUtil.padPre(personInfo.getJobNo(), 8, "0"));
@@ -200,36 +202,47 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
                     //需要将此人员变更为离职
 
                     staffCollect.entrySet().stream().forEach(item -> {
-                        StaffEntity staff = item.getValue();
-                        staff.setStatus(StaffSatusEnum.离职.getValue());
-                        staff.setUpdateTime(new Date());
-                        staff.setUpdateUserId(1L);
-                        this.update(staff);
-
-                        //新增离职人员
-                        StaffLeaveEntity staffLeaveEntity = new StaffLeaveEntity();
-                        staffLeaveEntity.initAttrValue();
-                        staffLeaveEntity.setStaffId(staff.getId());
-                        staffLeaveEntity.setStaffName(staff.getName());
-                        staffLeaveEntity.setGender(staff.getGender());
-                        staffLeaveEntity.setBirthday(staff.getBirthday());
-                        staffLeaveEntity.setPhotoPath(staff.getPhotoPath());
-                        staffLeaveEntity.setPhoneNumber(staff.getPhoneNumber());
-                        staffLeaveEntity.setIdCard(staff.getIdCard());
-                        staffLeaveEntity.setWorkNum(staff.getWorkNum());
-                        staffLeaveEntity.setPoliticalstatus(staff.getPoliticalstatus());
-                        staffLeaveEntity.setDeptId(staff.getDeptId());
-                        staffLeaveEntity.setDeptName(staff.getDeptName());
-                        staffLeaveEntity.setJobId(staff.getPositionId());
-                        staffLeaveEntity.setJobName(staff.getPositionName());
-                        staffLeaveEntity.setStaffType(staff.getStaffType());
-                        staffLeaveEntity.setStatus(StaffSatusEnum.离职.getValue());
-                        staffLeaveEntity.setLeaveDate(new Date());
-                        staffLeaveEntity.setLeaveReason("");
-                        staffLeaveEntity.setAuditStatus(AuditStatusEnum.通过.getValue());
-                        staffLeaveEntity.setCreateUserId(1L);
-                        staffLeaveEntity.setCreateTime(new Date());
-                        staffLeaveService.save(staffLeaveEntity);
+
+                        String key = item.getKey();
+                        if (!ObjectUtils.isEmpty(key)) {
+                            StaffEntity staff = item.getValue();
+                            staff.setStatus(StaffSatusEnum.离职.getValue());
+                            staff.setUpdateTime(new Date());
+                            staff.setUpdateUserId(1L);
+                            this.update(staff);
+
+                            //新增离职人员
+                            StaffLeaveEntity staffLeaveEntity = new StaffLeaveEntity();
+                            staffLeaveEntity.initAttrValue();
+                            staffLeaveEntity.setStaffId(staff.getId());
+                            staffLeaveEntity.setStaffName(staff.getName());
+                            staffLeaveEntity.setGender(staff.getGender());
+                            staffLeaveEntity.setBirthday(staff.getBirthday());
+                            staffLeaveEntity.setPhotoPath(staff.getPhotoPath());
+                            staffLeaveEntity.setPhoneNumber(staff.getPhoneNumber());
+                            staffLeaveEntity.setIdCard(staff.getIdCard());
+                            staffLeaveEntity.setWorkNum(staff.getWorkNum());
+                            staffLeaveEntity.setPoliticalstatus(staff.getPoliticalstatus());
+                            staffLeaveEntity.setDeptId(staff.getDeptId());
+                            staffLeaveEntity.setDeptName(staff.getDeptName());
+                            staffLeaveEntity.setJobId(staff.getPositionId());
+                            staffLeaveEntity.setJobName(staff.getPositionName());
+                            staffLeaveEntity.setStaffType(staff.getStaffType());
+                            staffLeaveEntity.setStatus(StaffSatusEnum.离职.getValue());
+                            staffLeaveEntity.setLeaveDate(new Date());
+                            staffLeaveEntity.setLeaveReason("");
+                            staffLeaveEntity.setAuditStatus(AuditStatusEnum.通过.getValue());
+                            staffLeaveEntity.setCreateUserId(1L);
+                            staffLeaveEntity.setCreateTime(new Date());
+
+                            StaffLeaveQuery staffLeaveQuery = new StaffLeaveQuery();
+                            staffLeaveQuery.setWorkNum(staff.getWorkNum());
+
+                            int count = staffLeaveService.count(staffLeaveQuery, null);
+                            if (count == 0) {
+                                staffLeaveService.save(staffLeaveEntity);
+                            }
+                        }
                     });
                 }
             }
@@ -244,7 +257,7 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
         super.saveAfter(entity, context);
         //初始化
         int count = balanceService.count(new AttendanceVacationBalanceQuery().staffId(entity.getId()), context);
-        if(count==0){
+        if (count == 0) {
             AttendanceVacationBalanceEntity balanceEntity = new AttendanceVacationBalanceEntity();
             balanceEntity.initAttrValue();
             balanceEntity.setStaffId(entity.getId());
@@ -257,11 +270,11 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
         }
         AttendanceStatQuery attendanceStatQuery = new AttendanceStatQuery();
         attendanceStatQuery.setYear(DateUtil.year(new Date()));
-        attendanceStatQuery.setMonth(DateUtil.month(new Date())+1);
+        attendanceStatQuery.setMonth(DateUtil.month(new Date()) + 1);
         attendanceStatQuery.setDay(DateUtil.dayOfMonth(new Date()));
         attendanceStatQuery.setStaffId(entity.getId());
         int count1 = attendanceStatService.count(attendanceStatQuery, context);
-        if(count1==0){
+        if (count1 == 0) {
             AttendanceStatEntity attendanceStatEntity = new AttendanceStatEntity();
             attendanceStatEntity.initAttrValue();
             attendanceStatEntity.setStaffId(entity.getId());
@@ -270,7 +283,7 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
             attendanceStatEntity.setDeptName(entity.getDeptName());
             attendanceStatEntity.setPhoneNumer(entity.getPhoneNumber());
             attendanceStatEntity.setYear(DateUtil.year(new Date()));
-            attendanceStatEntity.setMonth(DateUtil.month(new Date())+1);
+            attendanceStatEntity.setMonth(DateUtil.month(new Date()) + 1);
             attendanceStatEntity.setDay(DateUtil.dayOfMonth(new Date()));
             attendanceStatEntity.setCreateUserId(1L);
             attendanceStatEntity.setCreateTime(new Date());
@@ -311,7 +324,7 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
             }
 
         } catch (Exception e) {
-           log.error("保存系统用户异常!",e);
+            log.error("保存系统用户异常!", e);
         }
 
     }
@@ -329,9 +342,9 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
 
     @Override
     protected StaffEntity findBefore(StaffEntity params, PageInfo pageInfo, Context context) throws AppException {
-        if(params.getDeptId()!=null){
+        if (params.getDeptId() != null) {
             List<DeptEntity> deptList = deptService.getAllChildrenDept(params.getDeptId());
-            if(CollectionUtils.isNotEmpty(deptList)){
+            if (CollectionUtils.isNotEmpty(deptList)) {
                 List<Long> deptIdList = new ArrayList<>();
                 deptIdList.add(params.getDeptId());
                 deptList.forEach(item -> {