1

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

@@ -1219,7 +1219,7 @@ public class ReportController {
         EstimateTimeSetting estimateTimeSetting = null;
         if(comTimeType.getProjectManDay()==1){
             //剔除其中已通过的日报
-            List<Integer> filledReportIds = reportList.stream().filter(r->r.getId() != -1).map(Report::getId).collect(Collectors.toList());
+            List<Integer> filledReportIds = reportList.stream().filter(r->r.getId() != null).map(Report::getId).collect(Collectors.toList());
             List<Report> targetCheckList = reportList;
             if (filledReportIds.size() > 0) {
                 List<Report> passedReportList = reportMapper.selectList(new QueryWrapper<Report>().select("id").in("id", filledReportIds).eq("state", 1));

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

@@ -943,7 +943,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         p.setManDayStartDate(LocalDate.parse(manDayStartDate));
                     }
                     //检查项目人天是否超过已经填报的项目工时
-                    Report report = reportMapper.selectOne(new QueryWrapper<Report>().select("sum(working_time) as working_time").eq("project_id", id).and(i->i.eq("state", 0).or().eq("state", 1)));
+                    Report report = reportMapper.selectOne(new QueryWrapper<Report>().select("sum(working_time) as working_time").ge(!StringUtils.isEmpty(p.getManDayStartDate()),"create_date",p.getManDayStartDate()).eq("project_id", id).and(i->i.eq("state", 0).or().eq("state", 1)));
                     if(report!=null){
                         DecimalFormat df = new DecimalFormat("0.0");
                         if (estimateTimeSetting.getProjectManDayFillMode() == 0) {