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

attendance-performance-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -193,10 +193,14 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
 
 
         StaffQuery staffQuery = new StaffQuery();
-        staffQuery.setSource(1);
+
 
         int totalPersonNum = staffService.count(staffQuery, this.getContext());
         homeStatInfo.setTotalPersonNum(totalPersonNum);
+        staffQuery.setSource(1);
+
+        Integer totalAttendPersonNum = staffService.count(staffQuery, this.getContext());
+
         int totalDeptNum = deptService.count(new DeptQuery(), getContext());
         homeStatInfo.setTotalDeptNum(totalDeptNum);
 
@@ -222,11 +226,11 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
             cacheService.hset(RedisKey.KEY_ATTENC_TOTOAL_CACHE, DateUtil.format(new Date(), "yyyy-MM"), totalCache);
         }*/
 
-        Long totalCache = cacheService.hget(RedisKey.KEY_ATTENC_TOTOAL_CACHE, DateUtil.yesterday().toDateStr(), Long.class);
+/*        Long totalCache = cacheService.hget(RedisKey.KEY_ATTENC_TOTOAL_CACHE, DateUtil.yesterday().toDateStr(), Long.class);
         if (ObjectUtils.isEmpty(totalCache)) {
             totalCache = recordHikService.find(hikQuery).parallelStream().map(item -> item.getStaffId()).distinct().count();
             cacheService.hset(RedisKey.KEY_ATTENC_TOTOAL_CACHE, DateUtil.yesterday().toDateStr(), totalCache);
-        }
+        }*/
 
 
         //迟到次数
@@ -269,19 +273,20 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
 
 
         //总打卡记录
-        long totalAttend = attendanceRecordEntities.parallelStream().flatMap(item -> item.getAttendanceRecordDetailList().parallelStream()).count();
+/*        long totalAttend = attendanceRecordEntities.parallelStream().flatMap(item -> item.getAttendanceRecordDetailList().parallelStream()).count();
 
         long lackOfCardsAttend = attendanceRecordEntities.parallelStream()
                 .flatMap(item -> item.getAttendanceRecordDetailList().stream())
                 .filter(f -> GoWorkResultEnum.缺卡.getValue() == f.getGoWorkResult() || OffWorkResultEnum.缺卡.getValue() == f.getOffWorkResult())
-                .count();
+                .count();*/
         //异常考勤记录
         //未考勤
         // long noAtt=lackOfCards;
-        long att = totalCache - lackOfCardsAttend - levealPersonNum;
+        long att = totalAttendPersonNum - lackOfCards;
        // long att = totalAttend - lackOfCardsAttend;
         if (att != 0L) {
-            BigDecimal bigDecimal = new BigDecimal(att).divide(new BigDecimal(totalCache), 4, BigDecimal.ROUND_CEILING).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_CEILING);
+
+            BigDecimal bigDecimal = new BigDecimal(att).divide(new BigDecimal(totalAttendPersonNum), 4, BigDecimal.ROUND_CEILING).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_CEILING);
             homeStatInfo.setAttendRadio(bigDecimal.toString() + "%");
         } else {
             homeStatInfo.setAttendRadio("0%");
@@ -291,7 +296,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         homeStatInfo.setLatePersonNum(beLate);
         homeStatInfo.setLeftEarlyPersonNum(leaveEarly);
         homeStatInfo.setMissCardPersonNum(lackOfCards);
-        homeStatInfo.setAttendPersonNum(totalCache);
+        homeStatInfo.setAttendPersonNum(totalAttendPersonNum);
 
         data.put("homeStat", homeStatInfo);
         data.put("token", token);

attendance-performance-manager/src/main/java/com/mortals/xhx/common/pdu/HomeStatInfo.java

@@ -17,7 +17,7 @@ public class HomeStatInfo {
 
     private Integer totalDeptNum;
 
-    private Long attendPersonNum=0L;
+    private Integer attendPersonNum=0;
 
     private String attendRadio;
     /**

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

@@ -65,7 +65,14 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
         } else {
             day = 0;
         }
+
+        Date beginDateTime=DateUtil.parseDateTime(DateUtil.today()+" 08:00:00");
+        Date endDateTime=DateUtil.parseDateTime(DateUtil.today()+" 20:30:00");
+
+        boolean in = DateUtil.isIn(new Date(), beginDateTime, endDateTime);
+        if(in){
             syncDoorEvents();
+        }
         //calculateAttendByDay();
     }
 

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

@@ -177,7 +177,7 @@ public class FixWorkAttendance extends AttendanceWorkAbstract {
             //判断考勤时间是否在下班打卡区间内
             boolean offInTime = DateUtil.isIn(curDateTime, offWorkDateBefore, offWorkDateAfter);
             if (goInTime == false && offInTime == false) {
-                log.info("考勤时间不在上班区间与下班区间中，不做处理！attendDate:{}", DateUtil.formatDateTime(commonData.getAttendanceDate()));
+              //  log.info("考勤时间不在上班区间与下班区间中，不做处理！attendDate:{}", DateUtil.formatDateTime(commonData.getAttendanceDate()));
                 continue;
             }
             if (goInTime) {

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

@@ -183,7 +183,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                     //判断考勤时间是否在下班打卡区间内
                     boolean offInTime = DateUtil.isIn(curDateTime, offWorkDateBefore, offWorkDateAfter);
                     if (goInTime == false && offInTime == false) {
-                        log.info("考勤时间不在上班区间与下班区间中，不做处理！attendDate:{}", DateUtil.formatDateTime(commonData.getAttendanceDate()));
+                       // log.info("考勤时间不在上班区间与下班区间中，不做处理！attendDate:{}", DateUtil.formatDateTime(commonData.getAttendanceDate()));
                         continue;
                     }
                     if (goInTime) {

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

@@ -136,6 +136,20 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
 
     @Override
     public List<DeptTreeSelect> buildDeptTreeSelect(List<DeptEntity> list) {
+
+        for (Iterator<DeptEntity> iterator = list.iterator(); iterator.hasNext(); ) {
+            DeptEntity deptEntity = iterator.next();
+            List<StaffEntity> staffEntities = staffService.find(new StaffQuery().deptId(deptEntity.getId()));
+            List<Map<String, Object>> personList = new ArrayList<>();
+            staffEntities.forEach(item -> {
+                Map<String, Object> map = new HashMap<>();
+                map.put("staffId", item.getId());
+                map.put("staffName", item.getName());
+                map.put("deptId", item.getDeptId());
+                personList.add(map);
+            });
+            deptEntity.setPersonList(personList);
+        }
         //获取父节点
         List<DeptEntity> returnList = list.stream().filter(t -> t.getParentId() == 0).map(
                 m -> {