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 govSystemReplaceInfos) { + Wrapper 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());