From a86b5decb10ce43e620f12677fd1b3a4259b6861 Mon Sep 17 00:00:00 2001
From: WendyYang <realwendyyang@qq.com>
Date: Tue, 23 Apr 2024 10:53:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=9B=BF=E4=BB=A3=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hz/pm/api/projectlib/entity/ProjectGovSystemReplaceInfos.java | 3 +++
 .../java/com/hz/pm/api/projectlib/manage/DeclaredRecordManage.java    | 2 +-
 .../main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java   | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/entity/ProjectGovSystemReplaceInfos.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/entity/ProjectGovSystemReplaceInfos.java
index 836411d..107c47c 100644
--- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/entity/ProjectGovSystemReplaceInfos.java
+++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/entity/ProjectGovSystemReplaceInfos.java
@@ -40,6 +40,9 @@ public class ProjectGovSystemReplaceInfos implements Serializable {
     @ApiModelProperty("项目ID")
     private Long projectId;
 
+    @ApiModelProperty("项目编码")
+    private String projectCode;
+
     @ApiModelProperty("批次号")
     private Integer batchNo;
 
diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/DeclaredRecordManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/DeclaredRecordManage.java
index 6a4b4a4..6f53edc 100644
--- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/DeclaredRecordManage.java
+++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/DeclaredRecordManage.java
@@ -195,7 +195,7 @@ public class DeclaredRecordManage {
             item.setDeclaredUnit(w.getBuildOrgName());
             item.setProjectCode(w.getProjectCode());
             item.setProjectName(w.getProjectName());
-            item.setDeclaredAmount(w.getDeclareAmount());
+            item.setDeclaredAmount(w.getReviewAmount());
             item.setCreateTime(w.getCreateOn());
             return item;
         }).collect(Collectors.toList());
diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java
index f1b054b..5c20f10 100644
--- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java
+++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java
@@ -940,6 +940,9 @@ public class ProjectLibManage {
     }
 
     private void saveGovSystemReplaceInfos(Project project, List<GovSystemReplaceInfoDTO> govSystemReplaceInfos) {
+        Wrapper<ProjectGovSystemReplaceInfos> delQuery = Wrappers.lambdaQuery(ProjectGovSystemReplaceInfos.class)
+                .eq(ProjectGovSystemReplaceInfos::getProjectCode, project.getProjectCode());
+        projectGovSystemReplaceInfosService.remove(delQuery);
         if (CollUtil.isEmpty(govSystemReplaceInfos)) {
             return;
         }
@@ -949,6 +952,7 @@ public class ProjectLibManage {
             for (String systemName : curr.getSourceSystemNames()) {
                 ProjectGovSystemReplaceInfos replaceInfo = new ProjectGovSystemReplaceInfos();
                 replaceInfo.setProjectId(project.getId());
+                replaceInfo.setProjectCode(project.getProjectCode());
                 replaceInfo.setReplaceType(curr.getReplaceType());
                 replaceInfo.setSourceSystem(systemName);
                 replaceInfo.setTargetSystem(curr.getTargetSystemName());