添加假日数据

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

@@ -212,6 +212,9 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                     //判断在上班与下班区间访问内   在上班的最后时间 与下班的开始时间
                     boolean goOffBetweenTime = DateUtil.isIn(curDateTime, goWorkDateAfter, offWorkDateBefore);
 
+
+                    boolean updateCheck=false;
+
 //                    if(goOffBetweenTime){
 //                        //如果考勤时间在上班与下班区间内 则将考勤状态改为迟到  如果已经存在 在改为早退
 //                       // commonData.setAttendanceStatus(AttendanceStatusEnum.LATE.getCode());
@@ -228,6 +231,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                             if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId()) {
                                 attendanceRecordDetailEntity.setGoWorkResult(GoWorkResultEnum.正常.getValue());
                                 attendanceRecordDetailEntity.setGoWorkDate(recordHikEntity.getAttendanceDate());
+                               updateCheck=true;
                             }
                         }
 //                        boolean inTime = DateUtil.isIn(curDateTime, goWorkDateBefore, goWorkDateAfter);
@@ -252,6 +256,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                                 if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId()) {
                                     attendanceRecordDetailEntity.setGoWorkResult(GoWorkResultEnum.迟到.getValue());
                                     attendanceRecordDetailEntity.setGoWorkDate(recordHikEntity.getAttendanceDate());
+                                    updateCheck=true;
                                 }
                             }
                         }
@@ -283,7 +288,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                     }else{
                         if(goOffBetweenTime){
                             for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : commonData.getDetailEntityList()) {
-                                if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId()&&OffWorkResultEnum.缺卡.getValue()!=attendanceRecordDetailEntity.getGoWorkResult()) {
+                                if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId()&&!updateCheck) {
                                     attendanceRecordDetailEntity.setOffWorkResult(OffWorkResultEnum.早退.getValue());
                                     attendanceRecordDetailEntity.setOffWorkDate(recordHikEntity.getAttendanceDate());
                                 }

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

@@ -6,7 +6,7 @@ Content-Type: application/json
 {
   "loginName":"admin",
   "password":"admin",
-  "securityCode":"8888"
+  "securityCode":"admin"
 }
 
 > {%
@@ -27,6 +27,17 @@ Content-Type: application/json
 
 
 
+###海康考勤打卡记录计算
+POST {{baseUrl}}/attendance/record/hik/addAttendanceRecord
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+  "attendanceDateStart":"2023-10-19",
+  "attendanceDateEnd":"2023-10-19"
+}
+
+
 ###短信设置编辑
 GET {{baseUrl}}/sms/set/edit?id={{SmsSet_id}}
 Accept: application/json