diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleStepServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleStepServiceImpl.java index 93e5075..cb63bf8 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleStepServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleStepServiceImpl.java @@ -401,7 +401,6 @@ public class OaProjectScheduleStepServiceImpl implements IOaProjectScheduleStepS List userSteps = projectScheduleStepMapper.selectList(stepWrapper); // 统计进度数据(总数量、完成数、待验收数、延期数) - Map progressStats = new HashMap<>(); long total = userSteps.size(); long completed = userSteps.stream() .filter(step -> step.getStatus() != null && step.getStatus() == 2) // 已完成 @@ -414,11 +413,10 @@ public class OaProjectScheduleStepServiceImpl implements IOaProjectScheduleStepS .filter(step -> step.getEndTime().isAfter(step.getOriginalEndTime())) // 实际结束>原定结束 .count(); - progressStats.put("total", total); - progressStats.put("completed", completed); - progressStats.put("pendingAcceptance", pendingAcceptance); - progressStats.put("delayed", delayed); - result.put("progressStats", progressStats); + result.put("total", total); + result.put("completed", completed); + result.put("pendingAcceptance", pendingAcceptance); + result.put("delayed", delayed); return result; }