refactor(oa): 简化项目进度统计逻辑
- 移除不必要的中间变量 progressStats - 直接将统计数据放入结果 map 中 - 减少代码嵌套层级,提高可读性
This commit is contained in:
@@ -401,7 +401,6 @@ public class OaProjectScheduleStepServiceImpl implements IOaProjectScheduleStepS
|
||||
List<OaProjectScheduleStep> userSteps = projectScheduleStepMapper.selectList(stepWrapper);
|
||||
|
||||
// 统计进度数据(总数量、完成数、待验收数、延期数)
|
||||
Map<String, Object> 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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user