1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserCorpwxTimeController.java

@@ -2741,8 +2741,8 @@ public class UserCorpwxTimeController {
                 row.put("personalLeaveCount", personalLeaveCount.doubleValue());
                 row.put("lateCount", lateCount);
                 row.put("missingCardCount", missingCardCount);
-                row.put("shouldAttendCount", daysInMonth - allRestDayDates.size());
-                row.put("actualAttendanceCount", attendanceArray.stream().filter(s -> s != null && !s.isEmpty() && "√".equals(s)).count());
+                row.put("shouldAttendCount", daysInMonth - allRestDayDates.size()+restDayDates.size());
+                row.put("actualAttendanceCount", attendanceArray.stream().filter(s -> s != null && !s.isEmpty() && "√".equals(s)).count()+restDayDates.size());
                 row.put("daysCount", daysInMonth);
                 attendanceList.add(row);
             }