Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceStatEntity.java

@@ -187,7 +187,7 @@ public class AttendanceStatEntity extends AttendanceStatVo {
     /**
      * 考勤汇总-溜班（次）
      */
-    @Excel(name = "考勤汇总-溜班")
+    @Excel(name = "考勤汇总-溜班/早退")
     private Integer overtimeTimes;
     /**
      * 考勤汇总-空岗

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

@@ -184,7 +184,7 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
             AttendanceSummaryQuery query = new AttendanceSummaryQuery();
             query.setSummaryTimeEnd(DateUtils.getStrDate(entity.getEndTime()));
             query.setSummaryTimeStart(DateUtils.getStrDate(entity.getStartTime()));
-            query.setStaffId(entity.getStaffId());
+            query.setStaffId(entity.getLeavePersonId());
             cacheService.lpush(KEY_ATTENDANCE_STAT_CACHE, query);
       /*      AddAttendThread addAttendThread = new AddAttendThread(hikService, attendanceRecordHikQuery, context);
             ThreadPool.getInstance().execute(addAttendThread);*/