添加假期判断

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

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.util.DateUtils;
 import com.mortals.framework.util.ThreadPool;
+import com.mortals.xhx.common.code.AppealResultEnum;
 import com.mortals.xhx.common.code.AuditStatusEnum;
 import com.mortals.xhx.common.utils.AddAttendThread;
 import com.mortals.xhx.common.utils.AttendSummaryThread;
@@ -101,7 +102,7 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
             return;
         }
         //更新考勤记录与异常记录
-        if (AuditStatusEnum.通过.getValue() == entity.getAuditResult()) {
+        if (AppealResultEnum.通过.getValue() == entity.getAuditResult()||AppealResultEnum.撤销审批通过.getValue() == entity.getAuditResult()) {
             AttendanceRecordHikQuery attendanceRecordHikQuery = new AttendanceRecordHikQuery();
             attendanceRecordHikQuery.setStaffId(entity.getLeavePersonId());
             //判断请假的开始日期与结束日期

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

@@ -30,8 +30,8 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-  "attendanceDateStart":"2024-12-01",
-  "attendanceDateEnd":"2024-01-20"
+  "attendanceDateStart":"2023-12-20",
+  "attendanceDateEnd":"2023-12-20"
 }
 
 ###海康考勤打卡记录计算1