修改用户等

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

@@ -72,14 +72,14 @@ public class SyncDoorsEventAfterTaskImpl implements ITaskExcuteService {
         userEntity.setCreateUserName("admin");
         userEntity.setCreateTime(new Date());
         context.setUser(userEntity);
-        AttendanceRecordHikQuery recordHikEntity = new AttendanceRecordHikQuery();
+        AttendanceRecordHikQuery recordHikQuery = new AttendanceRecordHikQuery();
 
         // Date todayStart = DateUtil.offsetHour(new Date(), -5).toJdkDate();
-        //  recordHikEntity.setAttendanceDateStart(DateUtils.getCurrStrDate());
-        recordHikEntity.setAttendanceDateStart(DateUtil.today());
-        recordHikEntity.setAttendanceDateEnd(DateUtil.today());
+        //  recordHikQuery.setAttendanceDateStart(DateUtils.getCurrStrDate());
+        recordHikQuery.setAttendanceDateStart(DateUtil.today());
+        recordHikQuery.setAttendanceDateEnd(DateUtil.today());
         try {
-            recordHikService.addAttendanceRecordByQuery(recordHikEntity, context);
+            recordHikService.addAttendanceRecordByQuery(recordHikQuery, context);
         } catch (Exception e) {
             log.error("计算考勤异常", e);
         }

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

@@ -175,18 +175,6 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                         }
                     }
 
-     /*               for (AttendanceRecordDetailEntity detailEntity : detailEntityList) {
-                        if (OffWorkResultEnum.缺卡.getValue() == detailEntity.getOffWorkResult()) {
-                            attendanceRecordEntity.setPunchResult(YesNoEnum.NO.getValue());
-                            break;
-                        }
-
-                        if (OffWorkResultEnum.缺卡.getValue() == detailEntity.getOffWorkResult()) {
-                            attendanceRecordEntity.setPunchResult(YesNoEnum.NO.getValue());
-                            break;
-                        }
-                    }*/
-
                     if (YesNoEnum.YES.getValue() == attendanceRecordEntity.getSignInResult() && YesNoEnum.YES.getValue() == attendanceRecordEntity.getSignOutResult()) {
                         attendanceRecordEntity.setPunchResult(YesNoEnum.YES.getValue());
                     } else {
@@ -197,8 +185,8 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                     //判断是否存在记录 如果存在 则更新  维度   staffId  attendanceDate shiftsId attendanceGroupId
                     AttendanceRecordQuery query = new AttendanceRecordQuery();
                     query.setStaffId(attendanceRecordEntity.getStaffId());
-                    query.setClassId(attendanceRecordEntity.getClassId());
-                    query.setAttendanceGroupId(attendanceRecordEntity.getAttendanceGroupId());
+                   // query.setClassId(attendanceRecordEntity.getClassId());
+                   // query.setAttendanceGroupId(attendanceRecordEntity.getAttendanceGroupId());
                     query.setAttendanceDate(attendanceRecordEntity.getAttendanceDate());
 
                     AttendanceRecordEntity recordEntity = attendanceRecordService.selectOne(query);
@@ -208,6 +196,8 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                         attendanceRecordEntity.setUpdateUserId(this.getContextUserId(context));
                         attendanceRecordService.update(attendanceRecordEntity, context);
                     } else {
+
+
                         attendanceRecordService.save(attendanceRecordEntity, context);
                     }
                 }