lxy_01 2 недель назад
Родитель
Сommit
26794599db

+ 1 - 0
fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/AttendanceServiceImpl.java

@@ -599,6 +599,7 @@ public class AttendanceServiceImpl extends ServiceImpl<AttendanceMapper, Attenda
             List<LocalDate> workDaysListInRange = WorkDayCalculateUtils.getWorkDaysListInRange(((LocalDate)monthInfo.get("firstDay")).toString(),((LocalDate)monthInfo.get("lastDay")).toString(),2);
             kuanggongCount += workDaysListInRange.stream().filter(wD -> staffCollect.stream().noneMatch(sC -> sC.getClockDate().equals(wD)) && fixDakaCollection.stream().noneMatch(aF -> aF.getStartTime().toLocalDate().equals(wD))  && qingjiaCollection.stream().noneMatch(aF -> aF.getStartTime().toLocalDate().equals(wD))).collect(Collectors.toList()).size();
             strings.add(kuanggongCount + "");
+            strings.set(12,kuanggongCount * 8.0 + "");
             int xiaoyeCount = (int) staffCollect.stream().filter(s -> s.getAttendanceTypeName() != null && s.getAttendanceTypeName().contains("小夜班")).count();
             int dayeCount = (int) staffCollect.stream().filter(s -> s.getAttendanceTypeName() != null && s.getAttendanceTypeName().contains("大夜班")).count();
 //            int size = staffCollect.size();