考勤报表逻辑修改。

web/src/main/java/com/jpsoft/smart/modules/business/controller/WorkAttendanceController.java

@@ -100,10 +100,7 @@ public class WorkAttendanceController {
         //todo 查询考勤设置
         List<AlarmConfig> alarmConfigList = alarmConfigService.findByCompanyId(companyId);
 
-        int dayOfWorkAttendanceNum = alarmConfigList.size();
-
         //todo 查询单位人员
-
         Map<String,Object> searchParams = new HashMap<>();
 
         if (StringUtils.isNotEmpty(name)) {
@@ -188,6 +185,8 @@ public class WorkAttendanceController {
                 else{
                     workDays++;
 
+                    int missCount = 0;
+
                     for (WorkAttendance workAttendance : workAttendances) {
                         String result = workAttendance.getResult();
 
@@ -198,7 +197,7 @@ public class WorkAttendanceController {
                             leaveNum++; //早退
                         }
                         else if(result.equals(WorkAttendance.MISSING)){
-                            if (workAttendance.getClassifier().equals("1")){
+                            if (workAttendance.getClassifier().equals(1)){
                                 //上班缺卡
                                 missCardOnWorkCount++;
                             }
@@ -206,13 +205,15 @@ public class WorkAttendanceController {
                                 //下班缺卡
                                 missCardOffWorkCount++;
                             }
-                        }
 
-                        if (dayOfWorkAttendanceNum == missCardOnWorkCount + missCardOffWorkCount){
-                            //当天的考勤总数=上下班缺卡之和
-                            missCardAllDayCount++;
+                            missCount++;
                         }
                     }
+
+                    if (missCount == workAttendances.size()){
+                        //当天的考勤全部缺卡
+                        missCardAllDayCount++;
+                    }
                 }
             }