|
@ -702,7 +702,9 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM |
|
|
List<String> finishPlanTaskList; |
|
|
List<String> finishPlanTaskList; |
|
|
for (String projectId : projectIdsList) { |
|
|
for (String projectId : projectIdsList) { |
|
|
contractMoneyMap = contractInfoList.stream().filter(x -> x.getProjectId().equals(projectId)) |
|
|
contractMoneyMap = contractInfoList.stream().filter(x -> x.getProjectId().equals(projectId)) |
|
|
.collect(Collectors.toMap(HuzhouContractinfo::getTaskName, HuzhouContractinfo::getTotalMoney)); |
|
|
.collect(Collectors.toMap(HuzhouContractinfo::getTaskName, |
|
|
|
|
|
HuzhouContractinfo::getTotalMoney, |
|
|
|
|
|
(oldValue, newValue) -> newValue)); |
|
|
finishPlanTaskList = planInfoList.stream().filter(x -> x.getProjectId().equals(projectId)) |
|
|
finishPlanTaskList = planInfoList.stream().filter(x -> x.getProjectId().equals(projectId)) |
|
|
.filter(x -> x.getIsfinish().equals("2")).map(x -> x.getTaskName()).collect(Collectors.toList()); |
|
|
.filter(x -> x.getIsfinish().equals("2")).map(x -> x.getTaskName()).collect(Collectors.toList()); |
|
|
for (String key : contractMoneyMap.keySet()) { |
|
|
for (String key : contractMoneyMap.keySet()) { |
|
|