Forráskód Böngészése

PFM知识库导入的异常处理

JammeyJiang 3 hónapja
szülő
commit
b329e50929

+ 2 - 2
src/main/java/com/kcim/service/impl/CostDepartmentProfitServiceImpl.java

@@ -3603,7 +3603,7 @@ public class CostDepartmentProfitServiceImpl extends ServiceImpl<CostDepartmentP
             }
 
             // 计算完成率、环比、同比
-            for (CostProfitVo vo : currentYearList) {
+            for (CostProfitVo vo : activeCostProfitVo) {
                 // 设置同期数据
                 if (preYearCostProfitMap.containsKey(vo.getReportId())) {
                     vo.setSamePeriodAmount(preYearCostProfitMap.get(vo.getReportId()).getAmount());
@@ -3627,7 +3627,7 @@ public class CostDepartmentProfitServiceImpl extends ServiceImpl<CostDepartmentP
             }
 
             // 构建树状结构
-            Map<Long, List<CostProfitVo>> collect = currentYearList.stream()
+            Map<Long, List<CostProfitVo>> collect = activeCostProfitVo.stream()
                     .collect(Collectors.groupingBy(CostProfitVo::getReportParentId));
             List<CostProfitVo> costProfitParentVos = collect.get(NumberConstant.ZERO_L);
             collect.remove(NumberConstant.ZERO_L);