修改本月统计

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

@@ -273,20 +273,19 @@ 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 = totalAttendPersonNum - lackOfCardsAttend;
+        long att = totalAttendPersonNum - levealPersonNum;
        // long att = totalAttend - lackOfCardsAttend;
         if (att != 0L) {
-            log.info("att:"+att);
-            log.info("totalAttendPersonNum:"+totalAttendPersonNum);
+
             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 {

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) {