添加假日数据

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

@@ -146,6 +146,7 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
             staffQuery.setStatusNotList(Arrays.asList(StaffSatusEnum.离职.getValue()));
             Map<String, StaffEntity> staffCollect = this.find(staffQuery).stream().collect(Collectors.toMap(x -> x.getWorkNum(), y -> y, (o, n) -> n));
 
+
             List<PersonInfo> personInfoList = personRest.getData().getList();
             for (PersonInfo personInfo : personInfoList) {
                 if (ObjectUtils.isEmpty(personInfo.getJobNo())) {
@@ -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"));
@@ -195,11 +197,12 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
                     staffEntity.setUpdateTime(new Date());
                     this.update(staffEntity);
                 }
+
             }
-            log.info("离职人员：size:{},==>{}",staffCollect.size(),JSON.toJSONString(staffCollect));
             if (staffCollect.size() > 0) {
                 //需要将此人员变更为离职
                 staffCollect.entrySet().stream().forEach(item -> {
+
                     String key = item.getKey();
                     if (!ObjectUtils.isEmpty(key)) {
                         StaffEntity staff = item.getValue();
@@ -239,9 +242,12 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
                         if (count == 0) {
                             staffLeaveService.save(staffLeaveEntity);
                         }
-
                         //考勤人员中有离职的 删除
-                        Long[] groudStaffIds = attendanceGroupStaffService.find(new AttendanceGroupStaffQuery().staffId(staff.getId())).stream().toArray(Long[]::new);
+//                        List<AttendanceGroupStaffEntity> attendanceGroupStaffEntities = attendanceGroupStaffService.find(new AttendanceGroupStaffQuery().staffId(staff.getId()));
+//                        if (!ObjectUtils.isEmpty(attendanceGroupStaffEntities)) {
+//                            attendanceGroupStaffService.removeList(attendanceGroupStaffEntities,context);
+//                        }
+                        Long[] groudStaffIds = attendanceGroupStaffService.find(new AttendanceGroupStaffQuery().staffId(staff.getId())).stream().map(i->i.getId()).toArray(Long[]::new);
                         if (!ObjectUtils.isEmpty(groudStaffIds)) {
                             attendanceGroupStaffService.remove(groudStaffIds, null);
                         }
@@ -337,10 +343,7 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
         deptService.updateDeptNum(context);
     }
 
-    public static void main(String[] args) {
-        System.out.println("1" + StrUtil.padPre("125", 7, "0"));
 
-    }
 
     @Override
     protected StaffEntity findBefore(StaffEntity params, PageInfo pageInfo, Context context) throws AppException {
@@ -358,4 +361,17 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
         }
         return params;
     }
+
+    public static void main(String[] args) {
+        System.out.println("1" + StrUtil.padPre("125", 7, "0"));
+
+
+        ArrayList<AttendanceGroupStaffEntity> attendanceGroupStaffEntities = new ArrayList<>();
+
+        Long[] ids = attendanceGroupStaffEntities.stream().map(i -> i.getId()).toArray(Long[]::new);
+
+
+        System.out.println(JSON.toJSONString(ids));
+
+    }
 }
\ No newline at end of file