Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java

@@ -142,7 +142,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
         for (NcrTrackVO trackVO : infoList) {
             String projectName = trackVO.getProjectName();
             String yearName = trackVO.getYearName();
-            String market = getMarket(targetMarketList, trackVO);
+            String market = getMarket(targetMarketList, trackVO,ncrTrackVO.getCut());
             String projectVersion = trackVO.getProjectVersion();
             if(StringUtils.isNotBlank(projectVersion)){
                 trackVO.setProjectName(projectName+"-"+yearName+"-"+market+"-"+projectVersion);
@@ -296,7 +296,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
         }
     }
 
-    private String getMarket(List<DictModel> targetMarketList, NcrTrackVO trackVO) {
+    private String getMarket(List<DictModel> targetMarketList, NcrTrackVO trackVO,String cut) {
         //目标市场
         List<DictModel> dictModelList = new ArrayList<>();
         for (String s : trackVO.getTargetMarket().split(",")) {
@@ -308,7 +308,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
         if(dictModelList.size() != 0){
             StringBuilder sb = new StringBuilder();
             for (DictModel dictModel : dictModelList) {
-                if(CutEnum.CN.getValue().equals(trackVO.getCut())){
+                if(CutEnum.CN.getValue().equals(cut)){
                     sb.append(dictModel.getText()+",");
                 }else{
                     sb.append(dictModel.getTextEn()+",");

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java

@@ -40,5 +40,6 @@ public class SarFileSplitItemsEO implements Serializable {
     private String sMenuId;
 
     List<String> itemsCondi;
+    private String zhan3Shi4Shun4Xu4;// 展示顺序字段
 
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml

@@ -105,7 +105,7 @@
         insert into sar_file_split_items
         (id, info_id, items_num, items_name, menu_id,
         creation_user, creation_time, modify_time,
-        modify_user, iterms_conditions)
+        modify_user, iterms_conditions,zhan3_shi4_shun4_xu4)
         values
         <foreach collection="list" item="item" index="index" separator=",">(
             #{item.id, jdbcType=VARCHAR}, #{item.infoId, jdbcType=VARCHAR}, #{item.itemsNum, jdbcType=VARCHAR},
@@ -113,7 +113,7 @@
             #{item.menuId, jdbcType=VARCHAR},
             #{item.creationUser, jdbcType=VARCHAR},
             #{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP},
-            #{item.modifyUser, jdbcType=VARCHAR}, #{item.itermsConditions, jdbcType=CLOB}
+            #{item.modifyUser, jdbcType=VARCHAR}, #{item.itermsConditions, jdbcType=CLOB},#{item.zhan3Shi4Shun4Xu4, jdbcType=VARCHAR}
             )
         </foreach>
     </insert>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java

@@ -409,6 +409,9 @@ public class FileSpiltService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
 //            sarFileSplitMenuEODao.insertForeach(treeList);
@@ -674,6 +677,9 @@ public class FileSpiltService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -906,6 +912,9 @@ public class FileSpiltService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -1110,6 +1119,9 @@ public class FileSpiltService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -1311,6 +1323,9 @@ public class FileSpiltService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -1570,6 +1585,9 @@ public class FileSpiltService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -1762,6 +1780,9 @@ public class FileSpiltService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -2001,6 +2022,9 @@ public class FileSpiltService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitPdfService.java

@@ -240,6 +240,9 @@ public class FileSplitPdfService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -461,6 +464,9 @@ public class FileSplitPdfService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -687,6 +693,9 @@ public class FileSplitPdfService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -889,6 +898,9 @@ public class FileSplitPdfService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -1062,6 +1074,9 @@ public class FileSplitPdfService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -1284,6 +1299,9 @@ public class FileSplitPdfService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -1476,6 +1494,9 @@ public class FileSplitPdfService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -1663,6 +1684,9 @@ public class FileSplitPdfService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {

jero-web/src/views/regulationsKanban/index.vue

@@ -298,10 +298,11 @@ export default {
     },
     //虚拟清单名称事件
     entryNameClick(item) {
-      this.$router.push({
-        path: '/ParameterTemplateList',
+      let newUrl = this.$router.resolve({
+        path: '/docManage/library/detail',
         query: item
       })
+      window.open(newUrl.href, '_blank')
     },
     searchQuery() {
       this.pageNo = 1