DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(oa): 简化项目进度统计逻辑

Browse Source 
- 移除不必要的中间变量 progressStats
- 直接将统计数据放入结果 map 中
- 减少代码嵌套层级，提高可读性
This commit is contained in:
Joshi
2025-10-24 16:37:58 +08:00
parent 3ec67c9093
commit 75cd07a7b0
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProjectScheduleStepServiceImpl.java
View File

@@ -401,7 +401,6 @@ public class OaProjectScheduleStepServiceImpl implements IOaProjectScheduleStepS
List<OaProjectScheduleStep> userSteps = projectScheduleStepMapper.selectList(stepWrapper); List<OaProjectScheduleStep> userSteps = projectScheduleStepMapper.selectList(stepWrapper);
// 统计进度数据（总数量、完成数、待验收数、延期数） // 统计进度数据（总数量、完成数、待验收数、延期数）
Map<String, Object> progressStats = new HashMap<>();
long total = userSteps.size(); long total = userSteps.size();
long completed = userSteps.stream() long completed = userSteps.stream()
.filter(step -> step.getStatus() != null && step.getStatus() == 2) // 已完成 .filter(step -> step.getStatus() != null && step.getStatus() == 2) // 已完成
@@ -414,11 +413,10 @@ public class OaProjectScheduleStepServiceImpl implements IOaProjectScheduleStepS
.filter(step -> step.getEndTime().isAfter(step.getOriginalEndTime())) // 实际结束>原定结束 .filter(step -> step.getEndTime().isAfter(step.getOriginalEndTime())) // 实际结束>原定结束
.count(); .count();
progressStats.put("total", total); result.put("total", total);
progressStats.put("completed", completed); result.put("completed", completed);
progressStats.put("pendingAcceptance", pendingAcceptance); result.put("pendingAcceptance", pendingAcceptance);
progressStats.put("delayed", delayed); result.put("delayed", delayed);
result.put("progressStats", progressStats);
return result; return result;
} }