diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java index 6697e9093..80459604d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java @@ -7,6 +7,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectNameInfoEO; import com.jero.modules.project.service.IProjectNameInfoEOService; import io.swagger.annotations.Api; @@ -36,7 +37,7 @@ import java.util.List; public class ProjectNameInfoEOController extends JeroController { @Autowired private IProjectNameInfoEOService projectNameInfoEOService; - + /** * 分页列表查询 * @@ -71,6 +72,18 @@ public class ProjectNameInfoEOController extends JeroController list = projectNameInfoEOService.queryList(); return Result.OK(list); } + /** + * 返回项目全拼 + * + * @return + */ + @AutoLog(value = "返回项目全拼") + @ApiOperation(value="返回项目全拼", notes="返回项目全拼") + @GetMapping(value = "/queryProjectNameList") + public Result> queryProjectNameList(String cut) { + List list = projectNameInfoEOService.queryProjectNameList(cut); + return Result.OK(list); + } /** * 添加 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml index 1a14817c0..82ebedceb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml @@ -52,9 +52,13 @@ 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 project_year_name_info as pyni on plb.year_name_id=pyni.id - where plb.id in - - #{item} - + + + plb.id in + + #{item} + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectNameInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectNameInfoEOService.java index 1d430b3db..b1f3753eb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectNameInfoEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectNameInfoEOService.java @@ -1,5 +1,6 @@ package com.jero.modules.project.service; +import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectNameInfoEO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -59,6 +60,12 @@ public interface IProjectNameInfoEOService extends IService { */ List queryList(); + /** + * 返回项目全拼 + * @return + */ + List queryProjectNameList(String cut); + //void getSpaceInfo(String cut); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java index 5bda203a7..860beccf3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java @@ -370,11 +370,13 @@ public class NcrTrackServiceImpl extends ServiceImpl }else{ managementEOList = problemManagementEOService.list(); } - List collect = managementEOList.stream().map(ProblemManagementEO::getLawsId).collect(Collectors.toList()); + List lawsIdList = managementEOList.stream() + .filter(e->StringUtils.isNotBlank(e.getLawsId())).map(ProblemManagementEO::getLawsId).collect(Collectors.toList()); + List projectIdList = managementEOList.stream().filter(e->StringUtils.isNotBlank(e.getProjectId())).map(ProblemManagementEO::getProjectId).collect(Collectors.toList()); List documentLibraryEOList = new ArrayList<>(); - if(!collect.isEmpty()){ + if(!lawsIdList.isEmpty()){ Set lawIdSet = new HashSet<>(); - for (String lawIds : collect) { + for (String lawIds : lawsIdList) { lawIdSet.addAll(Arrays.asList(lawIds.split(","))); } if(!lawIdSet.isEmpty()){ @@ -383,23 +385,38 @@ public class NcrTrackServiceImpl extends ServiceImpl documentLibraryEOList = bussDocumentLibraryEOService.list(wrapper); } } + + List projectLibraryBaseList = new ArrayList<>(); + if(!projectIdList.isEmpty()){ + Set projectIdSet = new HashSet<>(); + for (String projectIds : projectIdList) { + projectIdSet.addAll(Arrays.asList(projectIds.split(","))); + } + if(!projectIdSet.isEmpty()){ + projectLibraryBaseList = problemManagementEOMapper.queryByIds(StringUtils.join(projectIdSet,",")); + } + } List ncrTrackVOList = new ArrayList<>(); for (ProblemManagementEO problemManagementEO : managementEOList) { //相关法规 if(StringUtils.isNotBlank(problemManagementEO.getLawsId())){ if(!documentLibraryEOList.isEmpty()){ - documentLibraryEOList = documentLibraryEOList.stream().filter(e->problemManagementEO.getLawsId().contains(e.getId())).collect(Collectors.toList()); - List serialNumberList = documentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); + List documentLibraryEOListTemp = documentLibraryEOList.stream() + .filter(e->StringUtils.isNotBlank(problemManagementEO.getLawsId()) + && problemManagementEO.getLawsId().contains(e.getId())).collect(Collectors.toList()); + List serialNumberList = documentLibraryEOListTemp.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); problemManagementEO.setLawsName(com.jero.modules.system.util.StringUtils.join(serialNumberList,",")); } } //相关项目 - if(com.jero.modules.system.util.StringUtils.isNotBlank(problemManagementEO.getProjectId())){ - List projectLibraryBaseList = problemManagementEOMapper.queryByIds(problemManagementEO.getProjectId()); + if(StringUtils.isNotBlank(problemManagementEO.getProjectId())){ + List projectLibraryBaseListTemp = projectLibraryBaseList.stream() + .filter(e->StringUtils.isNotBlank(problemManagementEO.getProjectId()) + && problemManagementEO.getProjectId().contains(e.getId())).collect(Collectors.toList()); //目标市场数据字典 List targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); List projectNameList = new ArrayList<>(); - for (ProjectLibraryBase projectLibraryBase : projectLibraryBaseList) { + for (ProjectLibraryBase projectLibraryBase : projectLibraryBaseListTemp) { //目标市场 String targetMarket = problemManagementEOService.getMarket(cut, targetMarketList, projectLibraryBase); //主项目的版本号 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java index d977fd1e9..d8474e4af 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java @@ -2,15 +2,22 @@ package com.jero.modules.project.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.system.vo.DictModel; +import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectNameInfoEO; import com.jero.modules.project.entity.ProjectYearNameInfoEO; +import com.jero.modules.project.mapper.ProblemManagementEOMapper; import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; import com.jero.modules.project.service.IProjectNameInfoEOService; import com.jero.modules.space.service.SpaceServiceImpl; +import com.jero.modules.system.enums.DicCodeEnum; +import com.jero.modules.system.service.ISysDictService; +import com.jero.modules.system.util.StringUtils; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -30,6 +37,12 @@ public class ProjectNameInfoEOServiceImpl extends ServiceImpl projectNameAndYear = projectNameInfoEOMapper.selectProjectNameAndYear(); return projectNameInfoEOList; } + /** + * 列表查询 + * + * @return + */ + @Override + public List queryProjectNameList(String cut) { + List projectLibraryBaseList = problemManagementEOMapper.queryByIds(null); + //目标市场数据字典 + List targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); + for (ProjectLibraryBase projectLibraryBase : projectLibraryBaseList) { + //目标市场 + String targetMarket = problemManagementEOService.getMarket(cut, targetMarketList, projectLibraryBase); + //主项目的版本号 + String projectVersion = ""; + if(com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getParentId())){ + projectVersion = "00"; + }else{ + projectVersion = projectLibraryBase.getProjectVersion(); + } + if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){ + projectLibraryBase.setProjectName(projectLibraryBase.getProjectName() + + "-" + projectLibraryBase.getYearName() + + "-" + targetMarket + +"-"+projectVersion); + } + } + return projectLibraryBaseList; + } /* @Override public void getSpaceInfo(String cut){