有效工时率修改1

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

@@ -11957,7 +11957,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 LocalDate createTimeLocalDate = createTime.toLocalDate();
                 boolean b1 = WorkDayCalculateUtils.sameMonth(createDate, createTimeLocalDate);
                 boolean b2 = WorkDayCalculateUtils.sameWeek(createDate, createTimeLocalDate);
-                if (b1&&b2){
+                if (b1||b2){
                     reports.add(report);
                 }
             }