修正踩点时间判定

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

@@ -12,12 +12,14 @@ import com.mortals.framework.service.ITask;
 import com.mortals.framework.service.ITaskExcuteService;
 import com.mortals.framework.util.DateUtils;
 import com.mortals.xhx.base.system.user.model.UserEntity;
+import com.mortals.xhx.common.code.CheckTypeEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.module.attendance.model.AttendanceRecordHikEntity;
 import com.mortals.xhx.module.attendance.model.AttendanceRecordHikQuery;
 import com.mortals.xhx.module.attendance.model.vo.AttendanceSummaryQuery;
 import com.mortals.xhx.module.attendance.service.AttendanceRecordHikService;
 import com.mortals.xhx.module.attendance.service.AttendanceStatService;
+import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery;
 import com.mortals.xhx.module.hik.door.model.req.door.DoorEventReq;
 import com.mortals.xhx.module.hik.door.model.rsp.door.DoorEventDataInfo;
 import com.mortals.xhx.module.hik.door.service.IHikDoorService;
@@ -36,6 +38,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 import static com.mortals.xhx.common.key.RedisKey.KEY_ATTENDANCE_STAT_CACHE;
+import static com.mortals.xhx.common.key.RedisKey.KEY_CHECK_SUMMARY_CACHE;
 
 /**
  * 同步获取下午海康门禁事件
@@ -70,6 +73,16 @@ public class SyncDoorsEventAfterTaskImpl implements ITaskExcuteService {
             query.setSummaryTimeStart(DateUtil.today());
             query.setSummaryTimeEnd(DateUtil.today());
             cacheService.lpush(KEY_ATTENDANCE_STAT_CACHE, query);
+
+/*            //绩效汇总
+            log.info("汇总当天绩效分数开始");
+            StaffCheckSummaryQuery summaryQuery = new StaffCheckSummaryQuery();
+            summaryQuery.setCheckType(CheckTypeEnum.考勤绩效.getValue());
+            summaryQuery.setCheckTimeStart(DateUtils.getDateTime(new Date(),"yyyy-MM")+"-01");
+            summaryQuery.setCheckTimeEnd(DateUtils.getCurrStrDate());
+            cacheService.lpush(KEY_CHECK_SUMMARY_CACHE, query);
+            log.info("汇总当天绩效分数结束");*/
+
         }
         //统计当日
         log.info("统计当日考勤");

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

@@ -254,13 +254,13 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                 for (AttendanceClassDetailEntity classDetail : attendanceClassDetailEntities) {
                     //计算区间范围
                     //上班打卡前时间
-                    Date goWorkDateBefore = DateUtil.offsetMinute(classDetail.getGoWorkDate(), -classDetail.getGoWorkDateBefore());
+                    Date goWorkDateBefore = DateUtil.offsetMinute(classDetail.getGoWorkDate(), -classDetail.getGoWorkDateBefore()-1);
                     //上班打卡后时间
-                    Date goWorkDateAfter = DateUtil.offsetMinute(classDetail.getGoWorkDate(), classDetail.getGoWorkDateAfter());
+                    Date goWorkDateAfter = DateUtil.offsetMinute(classDetail.getGoWorkDate(), classDetail.getGoWorkDateAfter()+1);
                     // 下班打卡前时间
-                    Date offWorkDateBefore = DateUtil.offsetMinute(classDetail.getOffWorkDate(), -classDetail.getOffWorkDateBefore());
-                    //下班打卡后时间
-                    Date offWorkDateAfter = DateUtil.offsetMinute(classDetail.getOffWorkDate(), classDetail.getOffWorkDateAfter());
+                    Date offWorkDateBefore = DateUtil.offsetMinute(classDetail.getOffWorkDate(), -classDetail.getOffWorkDateBefore()-1);
+                    //下班打卡后时间,默认偏移多一分钟
+                    Date offWorkDateAfter = DateUtil.offsetMinute(classDetail.getOffWorkDate(), classDetail.getOffWorkDateAfter()+1);
                     //判断考勤时间是否在上班打卡区间内  true 在 false 不在  格式化时间
                     //String currDate = DateUtil.formatTime(attendanceDate);
                     Date curDateTime = DateUtil.parseTime(DateUtil.formatTime(attendanceDate));