未符合项跟踪

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

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)){
+            if(StringUtils.isNotBlank(trackVO.getPlatform())){
-                trackVO.setProjectName(projectName+"-"+yearName+"-"+market+"-"+projectVersion);
+                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(",")) {
+        if(StringUtils.isNotBlank(trackVO.getTargetMarket())){
-            List<DictModel> dictModelListTemp = targetMarketList.stream()
+            for (String s : trackVO.getTargetMarket().split(",")) {
-                    .filter(e -> s.equals(e.getValue())).collect(Collectors.toList());
+                List<DictModel> dictModelListTemp = targetMarketList.stream()
-            dictModelList.addAll(dictModelListTemp);
+                        .filter(e -> s.equals(e.getValue())).collect(Collectors.toList());
+                dictModelList.addAll(dictModelListTemp);
+            }
         }
         String targetMarket = "";
         if(dictModelList.size() != 0){

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;
+