修改请假计算考勤

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

@@ -424,6 +424,11 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                 // DateUtil.between()
                 if (ObjectUtils.isEmpty(offWorkDate)) {
                     Date offWorkDate1 = attendanceClassDetailEntity.getOffWorkDate();
+
+                    if(attendanceClassDetailEntity.getOffWorkDateBefore()>0){
+                        offWorkDate1=DateUtil.offsetMinute(offWorkDate1, attendanceClassDetailEntity.getOffWorkDateBefore());
+                    }
+
                     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) {

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

@@ -38,7 +38,7 @@ Content-Type: application/json
 
 {
   "attendanceDateStart": "2024-07-01",
-  "attendanceDateEnd": "2024-07-01"
+  "attendanceDateEnd": "2024-07-31"
 }
 
 ###海康考勤打卡记录计算1
@@ -46,9 +46,9 @@ POST {{baseUrl}}/attendance/record/hik/addAttendanceRecord
 Content-Type: application/json
 
 {
-  "attendanceDateStart": "2024-07-01",
-  "attendanceDateEnd": "2024-07-01",
-  "staffId": 476
+  "attendanceDateStart": "2024-07-03",
+  "attendanceDateEnd": "2024-07-03",
+  "staffId": 365
 }