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

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/req/InspectSaveReq.java

@@ -159,6 +159,8 @@ public class InspectSaveReq extends BaseReq {
 
     private String windowNum;
 
+    private String workNum;
+
 
 
 }

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

@@ -51,7 +51,7 @@ public class SyncDoorsEventAfterTaskImpl implements ITaskExcuteService {
     public void excuteTask(ITask task) throws AppException {
         syncDoorEvents();
 
-        //calculateAttendByDay();
+        calculateAttendByDay();
     }
 
     private void calculateAttendByDay() {
@@ -65,8 +65,8 @@ public class SyncDoorsEventAfterTaskImpl implements ITaskExcuteService {
 
         // Date todayStart = DateUtil.offsetHour(new Date(), -5).toJdkDate();
         //  recordHikEntity.setAttendanceDateStart(DateUtils.getCurrStrDate());
-        recordHikEntity.setAttendanceDateStart(DateUtil.offsetHour(new Date(), -5).toString());
-        recordHikEntity.setAttendanceDateEnd(DateUtils.getCurrStrDate());
+        recordHikEntity.setAttendanceDateStart(DateUtil.today());
+        recordHikEntity.setAttendanceDateEnd(DateUtil.today());
         try {
             recordHikService.addAttendanceRecordByQuery(recordHikEntity, context);
         } catch (Exception e) {

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

@@ -45,6 +45,7 @@ public class FreedomWorkAttendance extends AttendanceWorkAbstract {
         this.freeworkService = SpringUtils.getBean(AttendanceGroupFreeworkService.class);
         this.attendanceClassService = SpringUtils.getBean(AttendanceClassService.class);
         this.attendanceRecordService = SpringUtils.getBean(AttendanceRecordService.class);
+        this.specialService = SpringUtils.getBean(AttendanceGroupFreeworkSpecialService.class);
     }
 
     @Override

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

@@ -131,7 +131,7 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt
                 checkDingMsg.setUserIds(personRest.getData());
                 checkDingMsg.setDateTime(DateUtil.formatDateTime(entity.getHappenTime() == null ? new Date() : entity.getHappenTime()));
                 checkDingMsg.setRuleStr(ruleStr);
-                checkDingMsg.setPerformTypeStr(PerformTypeEnum.评价差评绩效.getDesc());
+                checkDingMsg.setPerformTypeStr(PerformTypeEnum.其它绩效.getDesc());
                 checkDingMsg.setScore(entity.getScore().toString());
                 checkDingMsg.setSubAddType(entity.getSubAddType());
                 checkDingMsg.setPath(String.format("#/appealinfo?id=%s&&performType=%s&subAddType=%s", entity.getId(), PerformTypeEnum.其它绩效.getValue(), entity.getSubAddType()));