WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix_20230911_UAT' into fix_20230911_UAT

Browse Source
This commit is contained in:
gaosong
2023-12-06 17:46:32 +08:00
parent f9d614867c 514f4cd808
commit 346802c992
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
+2 -1
View File
@@ -55,7 +55,8 @@
plb.power, plb.power,
plb.producer, plb.producer,
sdi.item_text brandText, sdi.item_text brandText,
sdi.en_name brandTextEn sdi.en_name brandTextEn,
plb.platform_type
from project_library_base as plb from project_library_base as plb
left join project_name_info as pni on plb.project_name_id=pni.id 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 left join sys_user as studiouser on plb.studio_engineer=studiouser.id
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+10 -1
View File
@@ -12766,6 +12766,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
List<SysDictItem> sysDictItems = this.sysDictItemServiceImpl.selectItemsAll(); List<SysDictItem> sysDictItems = this.sysDictItemServiceImpl.selectItemsAll();
List<SysCategory> categoryList = sysCategoryService.list(); List<SysCategory> categoryList = sysCategoryService.list();
List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<LawsInventoryPlatformEO> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(LawsInventoryPlatformEO::getLawsInventoryId,lawsInventoryId); wrapper.eq(LawsInventoryPlatformEO::getLawsInventoryId,lawsInventoryId);
@@ -12819,7 +12820,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseList.stream() List<ProjectLibraryBase> libraryBaseList = projectLibraryBaseList.stream()
.filter(e -> e.getId().equals(projectLawsInventoryEO.getProjectLibraryId())).collect(Collectors.toList()); .filter(e -> e.getId().equals(projectLawsInventoryEO.getProjectLibraryId())).collect(Collectors.toList());
if(ObjectUtils.isNotEmpty(libraryBaseList)){ if(ObjectUtils.isNotEmpty(libraryBaseList)){
projectLawsInventoryEO.setProjectName(libraryBaseList.get(0).getProjectNameId()); //项目名称
List<ProjectLibraryBase> projectLibraryBases = libraryBaseList.stream()
.filter(e -> e.getId().equals(projectLawsInventoryEO.getProjectLibraryId())).collect(Collectors.toList());
Map<String,Object> 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 = ""; String flowStatus = "";