Merge remote-tracking branch 'origin/master'

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

@@ -58,7 +58,8 @@ public class SyncDoorsEventAfterTaskImpl implements ITaskExcuteService {
         Context context = new Context();
         UserEntity userEntity = new UserEntity();
         userEntity.setCreateUserId(1L);
-        userEntity.setCreateUserName("system");
+        userEntity.setId(1L);
+        userEntity.setCreateUserName("admin");
         userEntity.setCreateTime(new Date());
         context.setUser(userEntity);
         AttendanceRecordHikQuery recordHikEntity = new AttendanceRecordHikQuery();
@@ -160,7 +161,6 @@ public class SyncDoorsEventAfterTaskImpl implements ITaskExcuteService {
                     log.error("基础考勤数据保存异常", e.getMessage());
                 }
             }
-            // recordHikService.save(saveRecordList);
         }
         log.info("saveRecordList size:{}", saveRecordList.size());
     }

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

@@ -56,8 +56,8 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
         String excuteParam = task.getExcuteParam();
         if (!ObjectUtils.isEmpty(excuteParam)) {
             day = DataUtil.converStr2Int(excuteParam, 0);
-        }else{
-            day=0;
+        } else {
+            day = 0;
         }
         syncDoorEvents();
         //calculateAttendByDay();
@@ -67,15 +67,16 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
         Context context = new Context();
         UserEntity userEntity = new UserEntity();
         userEntity.setCreateUserId(1L);
-        userEntity.setCreateUserName("system");
+        userEntity.setId(1L);
+        userEntity.setCreateUserName("admin");
         userEntity.setCreateTime(new Date());
         context.setUser(userEntity);
         AttendanceRecordHikQuery recordHikEntity = new AttendanceRecordHikQuery();
 
         // 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/model/AttendanceStatEntity.java

@@ -136,7 +136,7 @@ public class AttendanceStatEntity extends AttendanceStatVo {
     /**
      * 考勤汇总-出勤率（%）
      */
-    @Excel(name = "考勤汇总-出勤率",percentEnabled = true,suffix="%",scale=4)
+    @Excel(name = "考勤汇总-出勤率",percentEnabled = true,suffix="%",scale=2)
     private BigDecimal attendanceRate;
     /**
      * 考勤汇总-未按规定打卡（含忘记打卡）