From ea64fdea008f75bf00c9046236ca4d4062ae90de Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 28 Sep 2023 14:10:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PlatformProjectLawsInventoryEOServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java index 4fa0795d0..2cc8f60b9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java @@ -11620,6 +11620,9 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO, req.getParameterMap()); if(StringUtils.isNotBlank(serialNumber)){ From b564ccd6be9883b056da6dbdb8585365fffc2cba Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 28 Sep 2023 14:18:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E4=BB=B6=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectLibraryBaseServiceImpl.java | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index a1737190b..d7ca2b6f9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -1367,16 +1367,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl 1){ map.put("lawsInventoryId",projectLawsInventoryEO.getId()); - map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+msg); + map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle); map.put("result",projectLawsInventoryEOS); mapList.add(map); }else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){ @@ -1532,16 +1525,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl 1){ map.put("lawsInventoryId",projectLawsInventoryEO.getId()); - map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+msg); + map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle); map.put("result",projectLawsInventoryEOS); mapList.add(map); }else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){ From d383d27838638637509ea6b8edb7fac2663cdafd Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 28 Sep 2023 15:10:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E5=92=8C=E8=AE=A4=E8=AF=81=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5=EF=BC=88=E8=B4=A3=E4=BB=BB=E9=83=A8?= =?UTF-8?q?=E9=97=A8=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...atformProjectCertificationInventoryEOServiceImpl.java | 5 +++++ .../impl/PlatformProjectLawsInventoryEOServiceImpl.java | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java index a568a77b3..31f23a177 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java @@ -4991,6 +4991,11 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI value = pullMore(dictItemList, projectCertificationInventoryEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory"); if(StringUtils.isNotBlank(value)){ projectCertificationInventoryEO.setDutyTerritory(value); + List list = Arrays.asList(value.split(",")); + List ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList()); + List valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList()); + projectCertificationInventoryEO.setDutyDepart(StringUtils.join(valueList,",")); + } } //工程接口人(责任领域下的工程接口人) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java index 2cc8f60b9..902dcf898 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java @@ -5592,6 +5592,15 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(value.split(",")); + List ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList()); + List valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList()); + projectLawsInventoryEO.setDutyDepart(StringUtils.join(valueList,",")); + } + if (StringUtils.isNotBlank(value)) { //工程接口人(责任领域下的工程接口人) Map objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value); From 4108fbd48a22e6e9b1a3a78340a6d6e8b28ee1a7 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 28 Sep 2023 15:17:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=92=8C=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectCertificationInventoryEOServiceImpl.java | 4 ++++ .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index b84d9dd84..c9c01689f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -4880,6 +4880,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(value.split(",")); + List ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList()); + List valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList()); + projectCertificationInventoryEO.setDutyDepart(StringUtils.join(valueList,",")); } } //工程接口人(责任领域下的工程接口人) 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 65587a46f..d68ac9d55 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 @@ -5522,6 +5522,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(value.split(",")); + List ddList = dictItemList.stream().filter(e -> "duty_territory".equals(e.getDictCode()) && list.contains(e.getItemValue())).collect(Collectors.toList()); + List valueList = ddList.stream().map(SysDictItem::getStatNode).collect(Collectors.toList()); + projectLawsInventoryEO.setDutyDepart(StringUtils.join(valueList,",")); + //工程接口人(责任领域下的工程接口人) Map objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectLawsInventoryEOTemp.getProjectLibraryId(), value);