diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml index 81b37fa4c..0d7e61b3d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml @@ -78,7 +78,9 @@ pi.prc_name, plb.project_name_id, plb.target_market, - plb.studio_engineer + plb.studio_engineer, + plb.project_version, + plb.parent_id FROM process_info pi left join project_library_base plb on plb.id = pi.project_library_id @@ -160,7 +162,9 @@ pi.prc_name, plb.project_name_id, plb.target_market, - plb.studio_engineer + plb.studio_engineer, + plb.project_version, + plb.parent_id FROM process_info pi LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id @@ -212,7 +216,9 @@ pi.prc_name, plb.project_name_id, plb.target_market, - plb.studio_engineer + plb.studio_engineer, + plb.project_version, + plb.parent_id FROM process_info pi LEFT JOIN project_library_base plb ON plb.id = pi.project_library_id diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java index e6c4d9d0c..9b55e60cd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java @@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; +import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO; import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService; @@ -23,6 +25,8 @@ import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService; import com.jero.modules.project.service.IProjectTaskInventoryEOService; import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.enums.DicCodeEnum; +import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; import com.jero.modules.todoCenter.entity.ProcessInfoEO; @@ -78,6 +82,8 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl targetMarketList = this.sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); + + String targetMarket = getMarket(cut, targetMarketList, data.getTargetMarket()); + //主项目的版本号 + String projectVersion = ""; + if(StringUtils.isBlank(data.getParentId())){ + projectVersion = "00"; + }else{ + projectVersion = data.getProjectVersion(); + } + + data.setProjectName(data.getProjectName() + "-" + data.getYearName() + "-" + targetMarket + "-" + projectVersion); + } //设置任务清单明细表id if(CollectionUtils.isNotEmpty(finalTaskInventoryDetailList)){ @@ -1062,4 +1083,28 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl targetMarketList, String targetMarkets) { + List dictModelList = new ArrayList<>(); + for (String s : targetMarkets.split(",")) { + List dictModelListTemp = targetMarketList.stream() + .filter(e -> s.equals(e.getValue())).collect(Collectors.toList()); + dictModelList.addAll(dictModelListTemp); + } + String targetMarket = ""; + 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)){ + targetMarket = sb.substring(0,sb.length()-1); + } + } + return targetMarket; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java index 94a903a45..9ea695af6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java @@ -107,4 +107,8 @@ public class ProcessInfoVO implements Serializable { /**标准信息**/ private String standardInfo; + /**项目版本**/ + private String projectVersion; + /**主项目id parent_id**/ + private String parentId; }