admin/wisdomisitezw_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
pengjie 2023-12-13 10:43:03 +08:00
parent 8b3345c251
commit c0e9bfb57c
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/ProjectQuantityController.java
View File

@ -256,9 +256,14 @@ public class ProjectQuantityController {
params.setNeedSave(true); params.setNeedSave(true);
try { try {
List<ProjectQuantity> listProjectQuantitys = ExcelImportUtil.importExcel(file.getInputStream(), ProjectQuantity.class, params); List<ProjectQuantity> listProjectQuantitys = ExcelImportUtil.importExcel(file.getInputStream(), ProjectQuantity.class, params);
String engineeringSn = request.getParameter("engineeringSn");
String projectSn = engineeringService.getOne(Wrappers.<Engineering>lambdaQuery().eq(Engineering::getEngineeringSn, engineeringSn)).getProjectSn();
projectQuantityService.remove(Wrappers.<ProjectQuantity>lambdaQuery()
.eq(ProjectQuantity::getProjectSn, projectSn)
.eq(ProjectQuantity::getEngineeringSn, engineeringSn));
for (ProjectQuantity projectQuantityExcel : listProjectQuantitys) { for (ProjectQuantity projectQuantityExcel : listProjectQuantitys) {
projectQuantityExcel.setEngineeringSn(request.getParameter("engineeringSn")); projectQuantityExcel.setEngineeringSn(engineeringSn);
projectQuantityExcel.setProjectSn(engineeringService.getOne(Wrappers.<Engineering>lambdaQuery().eq(Engineering::getEngineeringSn, projectQuantityExcel.getEngineeringSn())).getProjectSn()); projectQuantityExcel.setProjectSn(projectSn);
projectQuantityExcel.setCreateTime(new Date()); projectQuantityExcel.setCreateTime(new Date());
projectQuantityService.save(projectQuantityExcel); projectQuantityService.save(projectQuantityExcel);
} }

6
src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentPaymentServiceImpl.java
View File

@ -48,10 +48,10 @@ public class InvestmentPaymentServiceImpl extends ServiceImpl<InvestmentPaymentM
Page<InvestmentPaymentDto> investmentPaymentVoPage = PageUtil.copyProperties(baseMapper.selectPage(page, wrapper), InvestmentPaymentDto.class); Page<InvestmentPaymentDto> investmentPaymentVoPage = PageUtil.copyProperties(baseMapper.selectPage(page, wrapper), InvestmentPaymentDto.class);
List<Long> investmentIds = investmentPaymentVoPage.getRecords().stream().map(i -> i.getId()).collect(Collectors.toList()); List<Long> investmentIds = investmentPaymentVoPage.getRecords().stream().map(i -> i.getId()).collect(Collectors.toList());
if (investmentIds.size() > 0) { if (investmentIds.size() > 0) {
List<Long> investmentApplyList = investmentApplyService.list(Wrappers.<InvestmentApply>lambdaQuery().in(InvestmentApply::getInvestmentPaymentId, investmentIds)) List<InvestmentApply> investmentApplyList = investmentApplyService.list(Wrappers.<InvestmentApply>lambdaQuery().in(InvestmentApply::getInvestmentPaymentId, investmentIds));
.stream().map(InvestmentApply::getInvestmentPaymentId).collect(Collectors.toList());
for (InvestmentPaymentDto investmentApply : investmentPaymentVoPage.getRecords()) { for (InvestmentPaymentDto investmentApply : investmentPaymentVoPage.getRecords()) {
investmentApply.setApplyIdList(investmentApplyList.stream().filter(i -> i.equals(investmentApply.getId())).collect(Collectors.toList())); investmentApply.setApplyIdList(investmentApplyList.stream().filter(i -> i.getInvestmentPaymentId().equals(investmentApply.getId()))
.map(i -> i.getId()).collect(Collectors.toList()));
} }
} }
return investmentPaymentVoPage; return investmentPaymentVoPage;