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 4fa0795d0..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); @@ -11620,6 +11629,9 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO, req.getParameterMap()); if(StringUtils.isNotBlank(serialNumber)){ 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); 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){