admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
pengjie 2024-12-06 09:14:11 +08:00
parent 7a902a21fd
commit c2816c47cf
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/modules/cost/controller/IndexController.java
View File

@ -27,6 +27,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -160,7 +161,8 @@ public class IndexController {
List<Project> projects = projectService.list();
int budgetRisk = 0;
for (Project project : projects) {
List<CostContractPay> contractPayList = costContractPayList.stream().filter(c -> c.getSxm().equals(project.getProjectId().toString())).collect(Collectors.toList());
List<CostContractPay> contractPayList = costContractPayList.stream().filter(c -> StringUtils.isNotBlank(c.getSxm())
&& c.getSxm().equals(project.getProjectId().toString())).collect(Collectors.toList());
List<CostBudget> budgetList = costBudgetList.stream().filter(c -> c.getProjectSn().equals(project.getProjectSn())).collect(Collectors.toList());
if (budgetList.size() > 0) {
BigDecimal pay = contractPayList.stream().map(c -> new BigDecimal(c.getSfje())).reduce(BigDecimal.ZERO, BigDecimal::add);