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 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 06d9eb67c..3430e28c8 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 @@ -12766,6 +12766,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); @@ -12819,7 +12820,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 = "";