From 0c651dd6be3da04542de23286feb29c9b610b5c7 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 18 Oct 2022 11:24:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=8B=BC=E6=8E=A5,=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E7=89=88=E6=9C=AC=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/entity/ProjectLibraryBase.java    |  5 ++-
 .../mapper/xml/ProjectLibraryBaseMapper.xml   |  7 +--
 .../impl/ProjectLibraryBaseServiceImpl.java   | 43 +++++++++++++++++--
 3 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
index eb7f70757..d5ccb360b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
@@ -113,9 +113,12 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
     //主项目id parent_id
     private String parentId;
 
-    //排序
+    //项目版本
     private String projectVersion;
 
+    //软件版本
+    private String softwareVersion;
+
     //最后一个版本
     @TableField(exist = false)
     private String versionLast;
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 fa9462420..fd1013dba 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
@@ -44,9 +44,10 @@
             plb.sys_org_code,
             plb.update_by,
             plb.update_time,
-            parent_id,
-            project_version,
-            explanation
+            plb.parent_id,
+            plb.project_version,
+            plb.explanation,
+            plb.software_version
         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/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 58b2b6015..9913d5ce2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -446,13 +446,26 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	 */
 	@Override
 	public List<ProjectLibraryBase> queryPageList(Map<String,Object> params) {
-		Integer pageNo = Integer.parseInt(params.get("pageNo").toString());
-		Integer pageSize = Integer.parseInt(params.get("pageSize").toString());
 		List<ProjectLibraryBase> result = projectLibraryBaseMapper.queryPageList(params);
 		disposeData(result,"",false);
+		//目标市场
+		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
+
 		for(ProjectLibraryBase projectLibraryBase: result){
+			//目标市场
+			String targetMarket = getMarket(params, targetMarketList, projectLibraryBase);
+			//主项目的版本号
+			String projectVersion = "";
+			if(StringUtils.isBlank(projectLibraryBase.getParentId())){
+				projectVersion = "00";
+			}else{
+				projectVersion = projectLibraryBase.getProjectVersion();
+			}
 			if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){
-				projectLibraryBase.setProjectName(projectLibraryBase.getProjectName() + "-" + projectLibraryBase.getYearName());
+				projectLibraryBase.setProjectName(projectLibraryBase.getProjectName()
+						+ "-" + projectLibraryBase.getYearName()
+						+ "-" + targetMarket
+						+ "-" + projectVersion);
 			}
 		}
 		//数据组装
@@ -484,6 +497,30 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		return resultTemp;
 	}
 
+	private String getMarket(Map<String, Object> params, List<DictModel> targetMarketList, ProjectLibraryBase projectLibraryBase) {
+		List<DictModel> dictModelList = new ArrayList<>();
+		for (String s : projectLibraryBase.getTargetMarket().split(",")) {
+			List<DictModel> 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(params.get("cut"))){
+					sb.append(dictModel.getText()+",");
+				}else{
+					sb.append(dictModel.getTextEn()+",");
+				}
+			}
+			if(StringUtils.isNotBlank(sb)){
+				targetMarket = sb.substring(0,sb.length()-1);
+			}
+		}
+		return targetMarket;
+	}
+
 	public Page getPages(Integer currentPage, Integer pageSize, List<ProjectLibraryBase> list){
 		Page page =new Page();
 		if(list==null){