From 5644dd4d15fe877cf003601de5e4e7c56fbcdcbf Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Wed, 1 Jun 2022 15:48:22 +0800 Subject: [PATCH] =?UTF-8?q?bug53177=E8=AE=A2=E9=98=85=E9=A2=86=E5=9F=9F+?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E6=B6=88=E6=81=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BussDocumentLibraryEOServiceImpl.java | 2 +- .../impl/DummyInventoryBaseEOServiceImpl.java | 2 +- .../com/jero/modules/dummy/util/ListDiff.java | 2 +- .../impl/ProjectLawsInventoryEOServiceImpl.java | 15 ++++++++++----- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index f559a2388..6d03188c7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -2097,7 +2097,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("attestationType").split(",")); + List list = Arrays.asList(infoDiff.get("attestationType").split("\\|")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); if (StringUtils.isBlank(contentLog)) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/util/ListDiff.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/util/ListDiff.java index 3fd0a22b0..00a160582 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/util/ListDiff.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/util/ListDiff.java @@ -44,7 +44,7 @@ public class ListDiff { if(f.getName().contains("erritory") || f.getName().contains("emplate") || f.getName().equals(("shi4Yong4Fan4Wei2")) || f.getName().equals("region") || f.getName().equals("applyScope") || f.getName().contains("DeliverableType") - + || f.getName().equals("attestationType") ){ result.put(f.getName(), v1String.append("|").append(v2String).toString()); }else { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 42dfce7e1..e9d966546 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1815,9 +1815,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl attestationType = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.ATTESTATION_TYPE.getValue()); - String attestationTypeName = attestationType.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getAttestationType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - projectLawsInventoryEO.setAttestationType(attestationTypeName); + List attestationType = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getValue()); + List attestationTypeList = Arrays.asList(projectLawsInventoryEO.getAttestationType().split(",")); + StringBuilder attestationTypeBuilder = new StringBuilder(); + for (String midAttestationType : attestationTypeList) { + String dutyTerritoryName = attestationType.stream().filter(e -> e.getItemValue().equals(midAttestationType)).map(f -> f.getItemText()).collect(Collectors.joining(",")); + attestationTypeBuilder.append(dutyTerritoryName).append(","); + } + projectLawsInventoryEO.setAttestationType(attestationTypeBuilder.substring(0, attestationTypeBuilder.toString().length() - 1)); } else { projectLawsInventoryEO.setAttestationType("空"); } @@ -4401,12 +4406,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("attestationType").split(",")); + List list = Arrays.asList(infoDiff.get("attestationType").split("\\|")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); contentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; - List listEn = Arrays.asList(infoDiffEn.get("attestationType").split(",")); + List listEn = Arrays.asList(infoDiffEn.get("attestationType").split("\\|")); String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); enContentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ",";