From 7f80455f60a4c559e7ffdbe29cd4be3a41a13614 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 6 Dec 2023 17:13:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectLawsInventoryEOServiceImpl.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 7cea3f0c8..e5842ecd1 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 @@ -12798,6 +12798,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl sysDictItems = this.sysDictItemServiceImpl.selectItemsAll(); List categoryList = sysCategoryService.list(); + List targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(LawsInventoryPlatformEO::getLawsInventoryId,lawsInventoryId); @@ -12851,7 +12852,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl libraryBaseList = projectLibraryBaseList.stream() .filter(e -> e.getId().equals(projectLawsInventoryEO.getProjectLibraryId())).collect(Collectors.toList()); if(ObjectUtils.isNotEmpty(libraryBaseList)){ - projectLawsInventoryEO.setProjectName(libraryBaseList.get(0).getProjectNameId()); + //项目名称 + List projectLibraryBases = libraryBaseList.stream() + .filter(e -> e.getId().equals(projectLawsInventoryEO.getProjectLibraryId())).collect(Collectors.toList()); + Map paramEn = new HashMap<>(); + paramEn.put("cut",cut); + String targetMarket = projectLibraryBaseService.getMarket(paramEn, targetMarketList, projectLibraryBases.get(0)); + String projectName = projectLibraryBases.get(0).getPlatformType() + "-" + projectLibraryBases.get(0).getPower() + + "-" + projectLibraryBases.get(0).getProducer() + "-" + targetMarket; + projectLawsInventoryEO.setProjectName(projectName); } //流程状态 String flowStatus = ""; From 514f4cd808450198fce70544830ec25a3a0ae713 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 6 Dec 2023 17:36:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/mapper/xml/ProjectLibraryBaseMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml index 5419e9765..661bce3cb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml @@ -55,7 +55,8 @@ plb.power, plb.producer, sdi.item_text brandText, - sdi.en_name brandTextEn + sdi.en_name brandTextEn, + plb.platform_type from project_library_base as plb left join project_name_info as pni on plb.project_name_id=pni.id left join sys_user as studiouser on plb.studio_engineer=studiouser.id