优化考勤计算

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

@@ -214,6 +214,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                     commonData.setRecordHikEntities(recordHikEntities);
                     commonData.setFixedSpecialGroupMap(fixedSpecialGroupMap);
                     commonData.setClassDetailEntityMap(classDetailEntityMap);
+                    commonData.setLeaveRecordGroupMap(leaveRecordGroupMap);
                     workAbstract.doHandleWork(commonData);
                 }
 
@@ -243,6 +244,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                         commonData.setRecordHikEntities(recordHikEntities);
                         commonData.setFixedSpecialGroupMap(fixedSpecialGroupMap);
                         commonData.setClassDetailEntityMap(classDetailEntityMap);
+                        commonData.setLeaveRecordGroupMap(leaveRecordGroupMap);
                         workAbstract.doHandleWork(commonData);
                     }
                 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/CommonData.java

@@ -40,5 +40,7 @@ public class CommonData {
 
     private  Map<Long, List<AttendanceGroupFixedworkSpecialEntity>> fixedSpecialGroupMap;
 
+    private Map<Long, List<AttendanceLeaveRecordEntity>> leaveRecordGroupMap;
+
 
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java

@@ -85,6 +85,9 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
         Map<Long, AttendanceClassEntity> classEntityMap = commonData.getClassEntityMap();
         Map<Long, List<AttendanceGroupFixedworkSpecialEntity>> fixedSpecialGroupMap = commonData.getFixedSpecialGroupMap();
         this.classDetailEntityMap = commonData.getClassDetailEntityMap();
+
+        Map<Long, List<AttendanceLeaveRecordEntity>> leaveRecordGroupMap = commonData.getLeaveRecordGroupMap();
+
         if (ObjectUtils.isEmpty(attendanceGroupFixedworkEntity)) {
             log.info("attendanceGroupFixedworkEntity is null ! groupId:{}", commonData.getAttendanceGroupEntity().getId());
             return;
@@ -119,7 +122,8 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
         leaveRecordQuery.setLeavePersonId(commonData.getStaffId());
         leaveRecordQuery.setAuditResultList(Arrays.asList(1, 4));
         boolean isLeave = false;
-        List<AttendanceLeaveRecordEntity> leaveRecordEntities = attendanceLeaveRecordService.find(leaveRecordQuery);
+       // List<AttendanceLeaveRecordEntity> leaveRecordEntities = attendanceLeaveRecordService.find(leaveRecordQuery);
+        List<AttendanceLeaveRecordEntity> leaveRecordEntities = leaveRecordGroupMap.get(commonData.getStaffId());
 
         List<AttendanceLeaveRecordEntity> leaveRecords = null;
         if (!ObjectUtils.isEmpty(leaveRecordEntities)) {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendRecordServiceImpl.java

@@ -274,7 +274,7 @@ public class PerformAttendRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
                 this.remove(ids,null);
                 this.save(recordEntity);
             }
-            log.info("已经存在考勤记录，无需重复添加！");
+           // log.info("已经存在考勤记录，无需重复添加！");
         }
         //   this.save(recordEntity);
     }

attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http

@@ -46,7 +46,7 @@ POST {{baseUrl}}/attendance/record/hik/addAttendanceRecord
 Content-Type: application/json
 
 {
-  "attendanceDateStart": "2024-07-19",
+  "attendanceDateStart": "2024-07-01",
   "attendanceDateEnd": "2024-07-19",
   "staffId": 346
 }