填报及时率修改

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

@@ -4691,16 +4691,20 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     //根据设置
                     switch (timeliness){
                         case 1:createDate=createDate.plusDays(1);
+                                while(!WorkDayCalculateUtils.isWorkDay(createDate)){
+                                    createDate=createDate.plusDays(1);
+                                }
                         break;
                         case 2:createDate=createDate.plusDays(2);
+                            while(!WorkDayCalculateUtils.isWorkDay(createDate)){
+                                createDate=createDate.plusDays(2);
+                            }
                         break;
                     }
                     if(createTimeDate.isBefore(createDate)||createTimeDate.isEqual(createDate)){
                         num++;
                     }
                 }
-                System.out.println(days);
-                System.out.println(num);
                 BigDecimal bigDecimal=new BigDecimal(num);
                 BigDecimal divide;
                 if(days!=0){