|
@@ -20,6 +20,7 @@ import javax.annotation.Resource;
|
20
|
20
|
import java.util.HashMap;
|
21
|
21
|
import java.util.List;
|
22
|
22
|
import java.util.Map;
|
|
23
|
+import java.util.Optional;
|
23
|
24
|
|
24
|
25
|
/**
|
25
|
26
|
* 完成单位(PrjCompletecompany)表控制层
|
|
@@ -119,6 +120,14 @@ public class PrjCompletecompanyController extends BaseController {
|
119
|
120
|
paraMap.put("xm", xm.toString());
|
120
|
121
|
paraMap.put("dwmc", dwmc);
|
121
|
122
|
List<PrjCompletecompany> list = prjCompletecompanyService.getCompanyList(paraMap);
|
|
123
|
+ //获取各单位子课题中收款金额
|
|
124
|
+ List<PrjCompletecompany> companyListFy = prjCompletecompanyService.getCompanyListFy(xm);
|
|
125
|
+ list.forEach(company -> {
|
|
126
|
+ Optional<PrjCompletecompany> matchingCompanyFy = companyListFy.stream()
|
|
127
|
+ .filter(companyFy -> companyFy.getDwmc().equals(company.getDwmc()))
|
|
128
|
+ .findFirst();
|
|
129
|
+ matchingCompanyFy.ifPresent(companyFy -> company.setSumjf(companyFy.getSumjf()));
|
|
130
|
+ });
|
122
|
131
|
|
123
|
132
|
PageInfo<PrjCompletecompany> pageinfo = new PageInfo<>(list);
|
124
|
133
|
// 取出查询结果
|