From 20ea7b8230ed33fe7cfe07c9581f60b6e0b21c8f Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 28 Sep 2023 17:05:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/mapper/xml/NcrTrackMapper.xml     |  4 +++-
 .../service/impl/NcrTrackServiceImpl.java     | 21 ++++++++++++-------
 .../jero/modules/project/vo/NcrTrackVO.java   |  4 ++++
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
index a700a3eaa..b513a9e93 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
@@ -31,6 +31,8 @@
             pni.project_name,
             plb.target_market,
             plb.project_version,
+            plb.project_name_id,
+            plb.platform,
             pyni.year_name,
             pli.serial_number,
             pli.title,
@@ -62,7 +64,7 @@
         LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id
         LEFT JOIN project_year_name_info pyni ON pyni.id = plb.year_name_id
         where
-        plb.platform is null
+        1=1
         <!--<if test="ncrTrackVO.projectLibraryId != null and ncrTrackVO.projectLibraryId != ''">
             plb.id =#{ncrTrackVO.projectLibraryId}
             and
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 91c89f8d2..c6ad83b4a 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
@@ -192,11 +192,16 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
             String yearName = trackVO.getYearName();
             String market = getMarket(targetMarketList, trackVO,ncrTrackVO.getCut());
             String projectVersion = trackVO.getProjectVersion();
-            if(StringUtils.isNotBlank(projectVersion)){
-                trackVO.setProjectName(projectName+"-"+yearName+"-"+market+"-"+projectVersion);
+            if(StringUtils.isNotBlank(trackVO.getPlatform())){
+                trackVO.setProjectName(trackVO.getProjectNameId());
             }else{
-                trackVO.setProjectName(projectName+"-"+yearName+"-"+market);
+                if(StringUtils.isNotBlank(projectVersion)){
+                    trackVO.setProjectName(projectName+"-"+yearName+"-"+market+"-"+projectVersion);
+                }else{
+                    trackVO.setProjectName(projectName+"-"+yearName+"-"+market);
+                }
             }
+
             //责任领域中英文切换
             if(StringUtils.isNotBlank(trackVO.getDutyTerritory())){
                 String dutyTerritory = pull(dictItemList, trackVO.getDutyTerritory(), "duty_territory", ncrTrackVO.getCut());
@@ -783,10 +788,12 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
     private String getMarket(List<DictModel> targetMarketList, NcrTrackVO trackVO,String cut) {
         //目标市场
         List<DictModel> dictModelList = new ArrayList<>();
-        for (String s : trackVO.getTargetMarket().split(",")) {
-            List<DictModel> dictModelListTemp = targetMarketList.stream()
-                    .filter(e -> s.equals(e.getValue())).collect(Collectors.toList());
-            dictModelList.addAll(dictModelListTemp);
+        if(StringUtils.isNotBlank(trackVO.getTargetMarket())){
+            for (String s : trackVO.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){
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
index f1f1e1264..fd3b3a862 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
@@ -247,6 +247,10 @@ public class NcrTrackVO implements Serializable {
     @ApiModelProperty(value = "旧数据->old,新数据->new")
     private String flag;
 
+    private String projectNameId;
+
+    private String platform;
+