From a8c2c08e611f9dff6e7c9686330fb99578ae84c4 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Sun, 1 Sep 2024 13:28:11 +0800 Subject: [PATCH] =?UTF-8?q?modify:=201.=20=E5=8C=BA=E5=8E=BF=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=A4=87=E6=A1=88=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hz/pm/api/projectlib/manage/MhSystemReplaceManage.java | 2 ++ .../com/hz/pm/api/projectlib/manage/QxProjectManage.java | 13 +++++++------ .../java/com/hz/pm/api/projectlib/model/vo/QxProjectVO.java | 3 +++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/MhSystemReplaceManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/MhSystemReplaceManage.java index b5194f2..1ab3267 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/MhSystemReplaceManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/MhSystemReplaceManage.java @@ -171,6 +171,8 @@ public class MhSystemReplaceManage { query.eq(MhSystemReplaceInfo::getStopped, Boolean.FALSE); if (StrUtil.isBlank(req.getReplaceType())) { query.in(MhSystemReplaceInfo::getReplaceType, Arrays.asList(MhSystemReplaceType.IM, MhSystemReplaceType.IT)); + } else if (MhSystemReplaceType.NE.eq(req.getReplaceType())) { + return Collections.emptyList(); } UnitQueryState state = mhUnitQueryHelper.listCanViewUnitIds(req.getBuildOrgCode()); if (!state.isState()) { diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/QxProjectManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/QxProjectManage.java index fbc596e..5ca8400 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/QxProjectManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/QxProjectManage.java @@ -107,12 +107,13 @@ public class QxProjectManage { qxProjectSystemReplaceInfosService.saveBatch(projectSystemReplaceInfos); List relations = new ArrayList<>(); for (int i = 0; i < tmpSourceSystemIds.size(); i++) { - QxProjectSystemReplaceInfos replaceInfos = projectSystemReplaceInfos.get(i); - QxProjectSystemReplaceInfosRelation relation = new QxProjectSystemReplaceInfosRelation(); - relation.setSourceSystemId(tmpSourceSystemIds.get(i)); - relation.setReplaceInfosId(replaceInfos.getId()); - relation.setProjectId(project.getId()); - relations.add(relation); + for (String sourceSystemId : tmpSourceSystemIds.get(i).split(",")) { + QxProjectSystemReplaceInfosRelation relation = new QxProjectSystemReplaceInfosRelation(); + relation.setProjectId(project.getId()); + relation.setSourceSystemId(sourceSystemId); + relation.setReplaceInfosId(projectSystemReplaceInfos.get(i).getId()); + relations.add(relation); + } } qxProjectSystemReplaceInfosRelationService.saveBatch(relations); } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/vo/QxProjectVO.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/vo/QxProjectVO.java index b6c558c..a39a33f 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/vo/QxProjectVO.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/vo/QxProjectVO.java @@ -53,4 +53,7 @@ public class QxProjectVO { @ApiModelProperty("更新时间") private LocalDateTime updateOn; + @ApiModelProperty("创建时间") + private LocalDateTime createOn; + }