From c0e9bfb57ced900b2b3869bb27bce27275cfa454 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Wed, 13 Dec 2023 10:43:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/government/ProjectQuantityController.java | 9 +++++++--
 .../service/impl/InvestmentPaymentServiceImpl.java       | 6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/ProjectQuantityController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/ProjectQuantityController.java
index 96bf90c..3c2dd15 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/ProjectQuantityController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/ProjectQuantityController.java
@@ -256,9 +256,14 @@ public class ProjectQuantityController {
             params.setNeedSave(true);
             try {
                 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) {
-                    projectQuantityExcel.setEngineeringSn(request.getParameter("engineeringSn"));
-                    projectQuantityExcel.setProjectSn(engineeringService.getOne(Wrappers.<Engineering>lambdaQuery().eq(Engineering::getEngineeringSn, projectQuantityExcel.getEngineeringSn())).getProjectSn());
+                    projectQuantityExcel.setEngineeringSn(engineeringSn);
+                    projectQuantityExcel.setProjectSn(projectSn);
                     projectQuantityExcel.setCreateTime(new Date());
                     projectQuantityService.save(projectQuantityExcel);
                 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentPaymentServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentPaymentServiceImpl.java
index 4ad1ebd..e06bf7b 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentPaymentServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentPaymentServiceImpl.java
@@ -48,10 +48,10 @@ public class InvestmentPaymentServiceImpl extends ServiceImpl<InvestmentPaymentM
         Page<InvestmentPaymentDto> investmentPaymentVoPage = PageUtil.copyProperties(baseMapper.selectPage(page, wrapper), InvestmentPaymentDto.class);
         List<Long> investmentIds = investmentPaymentVoPage.getRecords().stream().map(i -> i.getId()).collect(Collectors.toList());
         if (investmentIds.size() > 0) {
-            List<Long> investmentApplyList = investmentApplyService.list(Wrappers.<InvestmentApply>lambdaQuery().in(InvestmentApply::getInvestmentPaymentId, investmentIds))
-                    .stream().map(InvestmentApply::getInvestmentPaymentId).collect(Collectors.toList());
+            List<InvestmentApply> investmentApplyList = investmentApplyService.list(Wrappers.<InvestmentApply>lambdaQuery().in(InvestmentApply::getInvestmentPaymentId, investmentIds));
             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;