diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java index 15f45239e..211aaeb69 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java @@ -83,7 +83,7 @@ public class ParamsManifestEOController extends JeroController stateMap = ManifestStateEnum.toMap(cut); rows.forEach(manifestEO -> { - manifestEO.setProjectName(paramsManifestEOService.getProjectById(manifestEO.getProjectId(), manifestEO.getProjectVersion()).getProjectName()); + manifestEO.setProjectName(paramsManifestEOService.getProjectById(manifestEO.getProjectId(), manifestEO.getProjectVersion(),paramsManifestEO.getCut()).getProjectName()); manifestEO.setState(stateMap.get(manifestEO.getState())); }); return Result.OK(cut, pageList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml index 223479319..55d306b2a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml @@ -203,7 +203,8 @@ select tmp_tb.* from( select plb.id as project_id, - concat(pni.project_name,'-',pyni.year_name,'-',target_market) as project_name + target_market as targetMarket, + concat(pni.project_name,'-',pyni.year_name) as project_name from project_library_base plb left join project_name_info as pni on plb.project_name_id = pni.id left join project_year_name_info as pyni on plb.year_name_id = pyni.id diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java index bbfaf178d..613f739ae 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java @@ -89,7 +89,7 @@ public interface IParamsManifestEOService extends IService { ParamsManifestEO copy(ParamsManifestEO paramsManifestEO, String sourceManifestId); - ParamsManifestVO getProjectById(String projectId, String projectVersion); + ParamsManifestVO getProjectById(String projectId, String projectVersion,String cut); List> labelListForProjectDetails(String projectId); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index af66d076a..a2d5830ce 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1836,7 +1836,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl manifestEOS = paramsManifestEOService.list(queryWrapper); for (ParamsManifestEO manifestEO : manifestEOS) { //项目名称 - ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(manifestEO.getProjectId(), manifestEO.getProjectVersion()); + ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(manifestEO.getProjectId(), manifestEO.getProjectVersion(),null); if (ObjectUtils.isNotEmpty(projectInfo)) { //url String urlParamsStr = parseUrlParams(manifestEO); @@ -5707,7 +5709,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl regionList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); + targetMarket = getTargetMarket(cut, regionList, targetMarket); + } + paramsManifestVO.setProjectName(paramsManifestVO.getProjectName()+"-"+ targetMarket + "-" + projectVersion); // 项目名称加上 相关项目版本 return paramsManifestVO; } + private String getTargetMarket(String cut, List regionList, String targetMarket) { + //适用地区 + List dictModelList = new ArrayList<>(); + String region = ""; + if(com.jero.modules.system.util.StringUtils.isNotBlank(targetMarket)){ + for (String s : targetMarket.split(",")) { + List dictModelListTemp = regionList.stream() + .filter(e -> s.equals(e.getValue())).collect(Collectors.toList()); + dictModelList.addAll(dictModelListTemp); + } + + if(dictModelList.size() != 0){ + StringBuilder sb = new StringBuilder(); + for (DictModel dictModel : dictModelList) { + if(CutEnum.CN.getValue().equals(cut)){ + sb.append(dictModel.getText()+","); + }else{ + sb.append(dictModel.getTextEn()+","); + } + } + if(com.jero.modules.system.util.StringUtils.isNotBlank(sb)){ + region = sb.substring(0,sb.length()-1); + } + } + } + return region; + } + @Override public List> labelListForProjectDetails(String projectId) { return paramsManifestEOMapper.labelListForProjectDetails(projectId);