|
@@ -1356,10 +1356,10 @@ public class ProjectInfoServiceImpl extends BaseServiceImpl<ProjectInfoMapper, P
|
|
|
throw new ServiceException(year+"年没有投资计划,请重新选择时间");
|
|
|
}
|
|
|
//市交通运输委完成金额
|
|
|
- BigDecimal trafficMoney = projectList.stream().filter(l -> l.getDutyUnit().contains("市交通建设委") && ObjectUtil.isNotEmpty(l.getYearlyInvest()))
|
|
|
+ BigDecimal trafficMoney = projectList.stream().filter(l -> l.getDutyUnit().contains("市交通运输委") && ObjectUtil.isNotEmpty(l.getYearlyInvest()))
|
|
|
.map(ProjectInvestPlan::getYearlyInvest).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
//铁路公路等项目个数
|
|
|
- long trafficTotal = projectList.stream().filter(l -> l.getDutyUnit().contains("市交通建设委") && "1,2,3,4,7".contains(l.getProjectType()+"")).count();
|
|
|
+ long trafficTotal = projectList.stream().filter(l -> l.getDutyUnit().contains("市交通运输委") && "1,2,3,4,7".contains(l.getProjectType()+"")).count();
|
|
|
//市住房城乡建委完成金额
|
|
|
BigDecimal houseMoney = projectList.stream().filter(l -> l.getDutyUnit().contains("市住房城乡建委") && ObjectUtil.isNotEmpty(l.getYearlyInvest()))
|
|
|
.map(ProjectInvestPlan::getYearlyInvest).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
@@ -1393,7 +1393,7 @@ public class ProjectInfoServiceImpl extends BaseServiceImpl<ProjectInfoMapper, P
|
|
|
//占全年投资计划
|
|
|
BigDecimal currentYearlyFinishedRatio = vo1.getQuarterAddRatioYearPlan();
|
|
|
//市交通运输委
|
|
|
- List<ProjectInvestPlanVO2> traffics = projectList.stream().filter(l -> l.getDutyUnit().contains("市交通建设委") && ObjectUtil.isNotEmpty(l.getYearlyInvest()))
|
|
|
+ List<ProjectInvestPlanVO2> traffics = projectList.stream().filter(l -> l.getDutyUnit().contains("市交通运输委") && ObjectUtil.isNotEmpty(l.getYearlyInvest()))
|
|
|
.collect(Collectors.toList());
|
|
|
reportVOMap1.put("一、市交通运输委",this.calculateTableOne(traffics, quarter));
|
|
|
for (int i = 1; i < typeValue.length; i++) {
|