修改请假计算考勤

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

@@ -326,13 +326,11 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
             Iterator<AttendanceRecordDetailEntity> iterator = commonData.getDetailEntityList().iterator();
             while (iterator.hasNext()) {
                 AttendanceRecordDetailEntity next = iterator.next();
-
                 if (next.getGoWorkResult() == GoWorkResultEnum.缺卡.getValue()) {
                     if (DateUtil.compare(new Date(), next.getGoWorkDate()) < 0) {
                         iterator.remove();
                     }
                 }
-
                 if (next.getOffWorkResult() == OffWorkResultEnum.缺卡.getValue()) {
                     if (DateUtil.compare(new Date(), next.getOffWorkDate()) < 0) {
                         next.setOffWorkDate(null);
@@ -344,6 +342,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
 
             // AttendanceClassDetailEntity attendanceClassDetailEntity = attendanceClassDetailService.get(commonData.getDetailEntityList().get(0).getShiftsId());
             AttendanceClassDetailEntity attendanceClassDetailEntity = classDetailEntityMap.get(commonData.getDetailEntityList().get(0).getShiftsId());
+
             commonData.getAttendanceRecordEntity().setClassId(attendanceClassDetailEntity == null ? 0L : attendanceClassDetailEntity.getClassId());
             commonData.getAttendanceRecordEntity().setClassName(attendanceClassDetailEntity == null ? "" : attendanceClassDetailEntity.getClassName());
         }
@@ -398,12 +397,24 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
             Integer offWorkResult = detail.getOffWorkResult();
             Date goWorkDate = detail.getGoWorkDate();
             Date offWorkDate = detail.getOffWorkDate();
+            AttendanceClassDetailEntity attendanceClassDetailEntity = classDetailEntityMap.get(detail.getShiftsId());
 
             if (GoWorkResultEnum.请假.getValue() < goWorkResult) {
-                //判断 异常记录是否在请假时间段内
-                // DateUtil.between()
+                //判断 异常记录是否在请假时间段内 如果缺卡是没有goWorkDate的
                 if (ObjectUtils.isEmpty(goWorkDate)) {
-                    detail.setGoWorkResult(GoWorkResultEnum.请假.getValue());
+                    //goWorkDate为空 缺卡状态
+                    Date goWorkDate1 = attendanceClassDetailEntity.getGoWorkDate();
+                    //判断请假区间是否在上班区间内 如果在 则设置为请假 格式化时间范围
+                   DateUtil.parse(DateUtil.format(startLeaveTime, "HH:mm:ss"),"HH:mm:ss") ;
+                   DateUtil.parse(DateUtil.format(endLeaveTime, "HH:mm:ss"),"HH:mm:ss") ;
+
+                    //DateUtil.
+                    boolean in = DateUtil.isIn(goWorkDate1, DateUtil.parse(DateUtil.format(startLeaveTime, "HH:mm:ss"), "HH:mm:ss"),
+                            DateUtil.parse(DateUtil.format(endLeaveTime, "HH:mm:ss"), "HH:mm:ss"));
+                    if(in){
+                        detail.setGoWorkResult(GoWorkResultEnum.请假.getValue());
+                    }
+
                 } else {
                     boolean in = DateUtil.isIn(goWorkDate, startLeaveTime, endLeaveTime);
                     if (in) {
@@ -416,7 +427,12 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                 //判断 异常记录是否在请假时间段内
                 // DateUtil.between()
                 if (ObjectUtils.isEmpty(offWorkDate)) {
-                    detail.setOffWorkResult(GoWorkResultEnum.请假.getValue());
+                    Date offWorkDate1 = attendanceClassDetailEntity.getOffWorkDate();
+                    boolean in = DateUtil.isIn(offWorkDate1, DateUtil.parse(DateUtil.format(startLeaveTime, "HH:mm:ss"), "HH:mm:ss"),
+                            DateUtil.parse(DateUtil.format(endLeaveTime, "HH:mm:ss"), "HH:mm:ss"));
+                    if (in) {
+                        detail.setOffWorkResult(GoWorkResultEnum.请假.getValue());
+                    }
                 } else {
                     boolean in = DateUtil.isIn(offWorkDate, startLeaveTime, endLeaveTime);
                     if (in) {

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

@@ -37,8 +37,8 @@ POST {{baseUrl}}/attendance/record/hik/addAttendanceRecord
 Content-Type: application/json
 
 {
-  "attendanceDateStart": "2024-08-01",
-  "attendanceDateEnd": "2024-08-15"
+  "attendanceDateStart": "2024-07-01",
+  "attendanceDateEnd": "2024-07-01"
 }
 
 ###海康考勤打卡记录计算1
@@ -46,9 +46,9 @@ POST {{baseUrl}}/attendance/record/hik/addAttendanceRecord
 Content-Type: application/json
 
 {
-  "attendanceDateStart": "2024-06-01",
-  "attendanceDateEnd": "2024-06-31",
-  "staffIdList": [484,234,584,507,561,346,349,196,482,447]
+  "attendanceDateStart": "2024-07-01",
+  "attendanceDateEnd": "2024-07-01",
+  "staffId": 476
 }