修改考勤汇总

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

@@ -5,7 +5,9 @@ import cn.hutool.core.util.StrUtil;
 import com.mortals.framework.service.IUser;
 import com.mortals.framework.util.StringUtils;
 import com.mortals.xhx.base.system.upload.service.UploadService;
+import com.mortals.xhx.common.code.ErrorStatusEnum;
 import com.mortals.xhx.common.code.GoWorkResultEnum;
+import com.mortals.xhx.common.code.ProcessStatusEnum;
 import com.mortals.xhx.module.attendance.model.*;
 import com.mortals.xhx.module.attendance.service.*;
 import com.mortals.xhx.module.dept.service.DeptService;
@@ -133,8 +135,11 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                             continue;
                         }
                         //获取班次信息
-                        AttendanceClassQuery attendanceClassQuery = new AttendanceClassQuery();
-                        AttendanceClassEntity attendanceClassEntity = attendanceClassService.selectOne(attendanceClassQuery.id(weekClassId));
+                        AttendanceClassEntity attendanceClassEntity = attendanceClassService.selectOne(new AttendanceClassQuery().id(weekClassId));
+                        if(ObjectUtils.isEmpty(attendanceClassEntity)){
+                            log.info("attendanceClassEntity is null ,weekClassId:{}",weekClassId);
+                        }
+
                         //获取班次详细信息
                         AttendanceClassDetailQuery attendanceClassDetailQuery = new AttendanceClassDetailQuery();
                         List<AttendanceClassDetailEntity> attendanceClassDetailEntities = attendanceClassDetailService.find(attendanceClassDetailQuery.classId(attendanceClassEntity.getId()));
@@ -317,7 +322,8 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                     SimpleDateFormat sdft = new SimpleDateFormat("HH:mm:ss");
                     Integer goWorkResult = recordDetailEntity.getGoWorkResult();
                     Integer offWorkResult = recordDetailEntity.getOffWorkResult();
-                    if (goWorkResult != 1) {
+
+                    if (GoWorkResultEnum.正常.getValue()!=goWorkResult) {
                         AttendanceRecordErrorEntity errorEntity = new AttendanceRecordErrorEntity();
                         errorEntity.setStaffId(attendanceRecordEntity.getStaffId());
                         errorEntity.setStaffName(attendanceRecordEntity.getStaffName());
@@ -338,11 +344,13 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                             errorEntity.setErrorDateTime(sdf.parse(s1));
                             errorEntity.setActualAttendanceDateTime(sdf.parse(s1));
                         }
-                        if (recordDetailEntity.getGoWorkResult() == 3) {
-                            errorEntity.setErrorStatus(0);
+                        if ( GoWorkResultEnum.缺卡.getValue()==recordDetailEntity.getGoWorkResult()) {
+
+                            errorEntity.setErrorStatus( ErrorStatusEnum.缺卡.getValue());
                         }
-                        if (recordDetailEntity.getGoWorkResult() == 4) {
-                            errorEntity.setErrorStatus(2);
+                        if (GoWorkResultEnum.迟到.getValue()==recordDetailEntity.getGoWorkResult() ) {
+
+                            errorEntity.setErrorStatus( ErrorStatusEnum.迟到.getValue());
                         }
                         errorEntity.setProcessStatus(0);
                         errorEntity.setCreateTime(new Date());