Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncDoorsEventTaskImpl.java

@@ -77,14 +77,14 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
     private void syncDoorEvents() {
         DoorEventReq doorEventReq = new DoorEventReq();
         List<Integer> eventTypes = new ArrayList<>();
-//        eventTypes.add(196885);
-//        eventTypes.add(196887);
-//        eventTypes.add(196893);
-//        eventTypes.add(196888);
-//        eventTypes.add(196889);
-//        eventTypes.add(196890);
-//        eventTypes.add(196891);
-        eventTypes.add(196893);//人脸认证通过
+        eventTypes.add(196885);
+        eventTypes.add(196887);
+        eventTypes.add(196893);
+        eventTypes.add(196888);
+        eventTypes.add(196889);
+        eventTypes.add(196890);
+        eventTypes.add(196891);
+     //   eventTypes.add(196893);//人脸认证通过
         doorEventReq.setEventTypes(eventTypes);
         // 获取当天的开始时间
         //Date todayStart = DateUtil.offsetHour(new Date(), -5).toJdkDate();

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

@@ -81,7 +81,6 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
 
     public void addAttendanceOtherRecordList(List<AttendanceRecordHikEntity> hikEntityList, Context context) throws Exception {
         List<AttendanceRecordHikEntity> collect = hikEntityList.stream().sorted(Comparator.comparing(AttendanceRecordHikEntity::getAttendanceDate)).collect(Collectors.toList());
-        //另一种实现
         Map<Long, List<AttendanceRecordHikEntity>> listMap = collect.stream().collect(Collectors.groupingBy(AttendanceRecordHikEntity::getStaffId));
 
         List<AttendanceRecordEntity> saveList = new ArrayList<>();
@@ -442,8 +441,6 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
         }
 
         if (!ObjectUtils.isEmpty(errorEntityList)) {
-            //添加异常记录，去掉异常列表中 重复的数据;
-
             errorService.save(errorEntityList, context);
         }
     }

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

 package com.mortals.xhx.module.attendance.service.work;
 
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.xhx.common.code.*;
@@ -213,7 +214,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                     boolean goOffBetweenTime = DateUtil.isIn(curDateTime, goWorkDateAfter, offWorkDateBefore);
 
 
-                    boolean updateCheck=false;
+                    boolean updateCheck = false;
 
 //                    if(goOffBetweenTime){
 //                        //如果考勤时间在上班与下班区间内 则将考勤状态改为迟到  如果已经存在 在改为早退
@@ -231,7 +232,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                             if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId()) {
                                 attendanceRecordDetailEntity.setGoWorkResult(GoWorkResultEnum.正常.getValue());
                                 attendanceRecordDetailEntity.setGoWorkDate(recordHikEntity.getAttendanceDate());
-                               updateCheck=true;
+                                updateCheck = true;
                             }
                         }
 //                        boolean inTime = DateUtil.isIn(curDateTime, goWorkDateBefore, goWorkDateAfter);
@@ -250,13 +251,13 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
 //                                }
 //                            }
 //                        }
-                    }else{
-                        if(goOffBetweenTime){
+                    } else {
+                        if (goOffBetweenTime) {
                             for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : commonData.getDetailEntityList()) {
-                                if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId()&&GoWorkResultEnum.缺卡.getValue()==attendanceRecordDetailEntity.getGoWorkResult()) {
+                                if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId() && GoWorkResultEnum.缺卡.getValue() == attendanceRecordDetailEntity.getGoWorkResult()) {
                                     attendanceRecordDetailEntity.setGoWorkResult(GoWorkResultEnum.迟到.getValue());
                                     attendanceRecordDetailEntity.setGoWorkDate(recordHikEntity.getAttendanceDate());
-                                    updateCheck=true;
+                                    updateCheck = true;
                                 }
                             }
                         }
@@ -285,10 +286,10 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                                 }
                             }
                         }*/
-                    }else{
-                        if(goOffBetweenTime){
+                    } else {
+                        if (goOffBetweenTime) {
                             for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : commonData.getDetailEntityList()) {
-                                if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId()&&!updateCheck) {
+                                if (attendanceRecordDetailEntity.getShiftsId() == classDetail.getId() && !updateCheck) {
                                     attendanceRecordDetailEntity.setOffWorkResult(OffWorkResultEnum.早退.getValue());
                                     attendanceRecordDetailEntity.setOffWorkDate(recordHikEntity.getAttendanceDate());
                                 }
@@ -314,7 +315,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                 if (next.getOffWorkResult() == OffWorkResultEnum.缺卡.getValue()) {
                     if (DateUtil.compare(new Date(), next.getOffWorkDate()) < 0) {
                         next.setOffWorkDate(null);
-                      //  next.setOffWorkResult(OffWorkResultEnum.正常.getValue());
+                        //  next.setOffWorkResult(OffWorkResultEnum.正常.getValue());
                         next.setOffWorkResult(null);
                     }
                 }
@@ -402,26 +403,21 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                 }
                 errorEntityList.add(errorEntity);
             }
-
         }
+        //删除当前员工当日未处理的异常后，重新添加
+        AttendanceRecordErrorQuery errorQuery = new AttendanceRecordErrorQuery();
+        errorQuery.setErrorDateTimeStart(dateStr);
+        errorQuery.setErrorDateTimeEnd(dateStr);
+        errorQuery.setStaffId(attendanceRecordEntity.getStaffId());
+        errorQuery.setProcessStatus(YesNoEnum.NO.getValue());
 
+        Long[] errorIds = errorService.find(errorQuery).stream().map(i -> i.getId()).toArray(Long[]::new);
 
+        if (!ObjectUtils.isEmpty(errorIds)) {
+            errorService.remove(errorIds, context);
+        }
 
         if (!ObjectUtils.isEmpty(errorEntityList)) {
-            //删除当前员工当日未处理的异常后，重新添加
-            AttendanceRecordErrorQuery errorQuery = new AttendanceRecordErrorQuery();
-            errorQuery.setErrorDateTimeStart(dateStr);
-            errorQuery.setErrorDateTimeEnd(dateStr);
-            errorQuery.setStaffId(attendanceRecordEntity.getStaffId());
-            errorQuery.setProcessStatus(YesNoEnum.NO.getValue());
-
-            Long[] errorIds = errorService.find(errorQuery).stream().map(i -> i.getId()).toArray(Long[]::new);
-
-            if (!ObjectUtils.isEmpty(errorIds)) {
-                errorService.remove(errorIds, context);
-            }
-
-
             for (AttendanceRecordErrorEntity errorEntity : errorEntityList) {
                 //查看是否存在相同的异常记录，如果存在 则不添加
                 errorQuery = new AttendanceRecordErrorQuery();
@@ -443,9 +439,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
         }
 
 
-        if (!ObjectUtils.isEmpty(errorSwitchNormalList)) {
-            //删除异常记录
-        }
     }
 
 

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

@@ -33,8 +33,8 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-  "attendanceDateStart":"2023-12-08",
-  "attendanceDateEnd":"2023-12-08"
+  "attendanceDateStart":"2023-12-29",
+  "attendanceDateEnd":"2023-12-29"
 }