修改 请假记录 每人考勤显示

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

@@ -385,11 +385,11 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
             Date goWorkDate = detail.getGoWorkDate();
             Date offWorkDate = detail.getOffWorkDate();
 
-            if (GoWorkResultEnum.正常.getValue() != goWorkResult) {
+            if (GoWorkResultEnum.请假.getValue() < goWorkResult) {
                 //判断 异常记录是否在请假时间段内
                 // DateUtil.between()
                 if(ObjectUtils.isEmpty(goWorkDate)){
-                    detail.setGoWorkResult(GoWorkResultEnum.正常.getValue());
+                    detail.setGoWorkResult(GoWorkResultEnum.请假.getValue());
                 }else{
                     boolean in = DateUtil.isIn(goWorkDate, startLeaveTime, endLeaveTime);
                     if (in) {
@@ -399,11 +399,11 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
 
             }
 
-            if (GoWorkResultEnum.正常.getValue() != offWorkResult) {
+            if (GoWorkResultEnum.请假.getValue() < offWorkResult) {
                 //判断 异常记录是否在请假时间段内
                 // DateUtil.between()
                 if(ObjectUtils.isEmpty(offWorkDate)){
-                    detail.setOffWorkResult(GoWorkResultEnum.正常.getValue());
+                    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

@@ -58,8 +58,8 @@ POST {{baseUrl}}/attendance/record/hik/addAttendanceRecordCustom
 Content-Type: application/json
 
 {
-  "attendanceDateStart": "2024-05-01",
-  "attendanceDateEnd": "2024-05-19"
+  "attendanceDateStart": "2024-05-22",
+  "attendanceDateEnd": "2024-05-28"
 }