填报及时率修改

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -6762,12 +6762,17 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             if(leaveSheets.size()>0){
                 for (LeaveSheet leaveSheet : leaveSheets) {
                     List<LocalDateTime> leaveDateList = getDays(leaveSheet.getStartDate().atTime(LocalTime.MIN), leaveSheet.getEndDate().atTime(LocalTime.MIN));
-                    if(leaveSheet.getTimeDays()<=1){
+                    /*if(leaveSheet.getTimeDays()<=1){
                         days-=1;
                     }else{
                         days-=leaveSheet.getTimeDays();
+                    }*/
+                    List<LocalDateTime> list = getDays(leaveSheet.getStartDate().atTime(LocalTime.now()), leaveSheet.getEndDate().atTime(LocalTime.now()));
+                    if(list.size()>1){
+                        days-=list.size();
+                    }else {
+                        days-=1;
                     }
-                    System.out.println(leaveDateList.size());
                     for (LocalDateTime localDateTime : leaveDateList) {
                         //todo: 请假区间当中有非工作日在之前被当作 不需填报 所以要加上 保证基数正确
                         if(!WorkDayCalculateUtils.isWorkDay(localDateTime.toLocalDate())){
@@ -6793,7 +6798,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 }
             }
             int num=0;
-            System.out.println(days);
+            System.out.println("总天数"+days);
             if(mapList!=null){
                 for (Map<String, Object> map : mapList) {
                     Map<String,Object> objectMap=new HashMap<>();