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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java

@@ -196,15 +196,15 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 		Map<String, Object> stringMapEn = new HashMap<>();
 		this.problemKnowledgeBaseEOConvertMapByCut(problemKnowledgeBaseEO,CutEnum.EN.getValue(),stringMapEn);
 
-		this.putMap(problemKnowledgeBaseId,sbCn.toString(),CutEnum.CN.getValue(),stringMapCn,SEARCH_FLAG,"问题知识库");
-		this.putMap(problemKnowledgeBaseId,sbEn.toString(),CutEnum.EN.getValue(),stringMapEn,SEARCH_FLAG,"Problem knowledge base");
+		this.putMap(problemKnowledgeBaseId,sbCn.toString(),CutEnum.CN.getValue(),stringMapCn,SEARCH_FLAG,"知识分享");
+		this.putMap(problemKnowledgeBaseId,sbEn.toString(),CutEnum.EN.getValue(),stringMapEn,SEARCH_FLAG,"Knowledge Sharing");
 
 		Map<String, Object> stringMapCnBase = new HashMap<>();
 		this.problemKnowledgeBaseEOConvertMapByCut(problemKnowledgeBaseEO,CutEnum.EN.getValue(),stringMapCnBase);
 		Map<String, Object> stringMapEnBase = new HashMap<>();
 		this.problemKnowledgeBaseEOConvertMapByCut(problemKnowledgeBaseEO,CutEnum.EN.getValue(),stringMapEnBase);
-		this.putMap(problemKnowledgeBaseId,sbCn.toString(),CutEnum.CN.getValue(),stringMapCnBase,null,"问题知识库");
-		this.putMap(problemKnowledgeBaseId,sbEn.toString(),CutEnum.EN.getValue(),stringMapEnBase,null,"Problem knowledge base");
+		this.putMap(problemKnowledgeBaseId,sbCn.toString(),CutEnum.CN.getValue(),stringMapCnBase,null,"知识分享");
+		this.putMap(problemKnowledgeBaseId,sbEn.toString(),CutEnum.EN.getValue(),stringMapEnBase,null,"Knowledge Sharing");
 
 		mapListTempCn.add(stringMapCn);
 		mapListTempEn.add(stringMapEn);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/enums/ModuleTypeFlagEnum.java

@@ -3,7 +3,7 @@ package com.jero.modules.searchcenter.enums;
 public enum ModuleTypeFlagEnum {
     DOCUMENT_LIBRARY("文档库","WDK"),
     LAWS_MONTHLY_REPORT("法规月报","FGYB"),
-    PROBLEM_KNOWLEDGE_BASE_CLASSIFY("问题知识库","WTZSK");
+    PROBLEM_KNOWLEDGE_BASE_CLASSIFY("知识分享","WTZSK");
 
     String name;
     String value;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java

@@ -1488,7 +1488,13 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
             List<ProblemKnowledgeBaseUserEO> problemKnowledgeBaseUserEOList = this.problemKnowledgeBaseUserEOService.list(userPermissionQueryWrapper);
 
             if(CollectionUtils.isNotEmpty(problemKnowledgeBaseUserEOList)){
-                List<String> problemKnowledgeBaseIdList = problemKnowledgeBaseUserEOList.stream().map(ProblemKnowledgeBaseUserEO::getProblemKnowledgeBaseId).distinct().collect(Collectors.toList());
+                List<String> problemKnowledgeBaseIdList = problemKnowledgeBaseUserEOList.stream().filter(e->{
+                    boolean flag = false;
+                    if(StringUtils.isNotEmpty(e.getProblemKnowledgeBaseId())){
+                        flag = true;
+                    }
+                    return flag;
+                }).map(ProblemKnowledgeBaseUserEO::getProblemKnowledgeBaseId).distinct().collect(Collectors.toList());
 
                 //in查询该用户拥有权限的问题知识库id。
                 Map<String, Object> fieldKeyMap2 = new HashMap<>();

jero-web/src/common/lang/en-us.js

@@ -1028,7 +1028,7 @@ module.exports = {
   viewProcess: 'View Process',
   evaluationResults: 'Evaluation Results',
   Assessor: 'Assessor',
-  collectionOfRegulatoryOpinions: 'Collection Of Regulatory Opinions',
+  collectionOfRegulatoryOpinions: 'Opinion Collection of Regulation',
   collectionOfRegulatoryOpinionsProcess: 'Collection Of Regulatory Opinions Process',
   feedbackInformation: 'Feedback',
   relevantSections: 'Chapter',
@@ -1211,7 +1211,7 @@ module.exports = {
   Inthecollection: 'During collection',
   Notatthe: 'Not started',
   Thepercentage: 'The Percentage',
-  problemKnowledgeBase: 'Q&A Knowledge',
+  problemKnowledgeBase: 'Knowledge Sharing',
   recentHotSpots: 'Recent Hot Spots',
   disseminationMaterials: 'Dissemination Materials',
   informationSafety: 'Information Safety',
@@ -1291,8 +1291,8 @@ module.exports = {
   rejectedBy:'Rejected By',
   rejectionTime:'Rejection Time',
   rejectReason:'Reject Reason',
-  collectionLegislativeComments:'Collection of Legislative Comments',
-  regulatoryAndTechnicalAssessment:'Regulatory and technical assessment',
+  collectionLegislativeComments:'Opinion Collection of Regulation',
+  regulatoryAndTechnicalAssessment:'Regulation Technical Assessment',
   listConfirmationRejectionReason:'List confirmation rejection reason',
   taskConfirmationRejectionReason:'Task confirmation rejection reason',
   onlyCompletedDataCanBeDeleted:'Only completed data can be deleted',

jero-web/src/common/lang/zh-cn.js

@@ -1313,7 +1313,7 @@ module.exports = {
   Inthecollection: '收集中',
   Notatthe: '未开始',
   Thepercentage: '百分比',
-  problemKnowledgeBase: '问题知识库',
+  problemKnowledgeBase: '知识分享',
   recentHotSpots: '近期热点',
   disseminationMaterials: '传播物料',
   informationSafety: '信息安全',

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue

@@ -211,7 +211,8 @@
         downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
         pageNo: 1,
         url: {
-          getInfoList: '/problemKnowledgeBase/problemKnowledgeBaseEO/page'
+          getInfoList: '/problemKnowledgeBase/problemKnowledgeBaseEO/page',
+          getjiekou: '/problemKnowledgeBase/problemKnowledgeBaseEO/queryById'
         },
         CommentQuery: {}
       }
@@ -424,7 +425,7 @@
         this.$nextTick(() => {
           this.$refs.problemKnowledgeBaseListViewRef.getData(JSON.parse(JSON.stringify(val)))
         })
-      }
+      },
     }
   }
 </script>

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue

@@ -34,8 +34,10 @@
             {{queryForm.createBy}}
           </div>
           <div class="content-box-button-text" v-if="queryForm.standNumber">
-            <a-icon type="file-markdown"/>
-            {{queryForm.standNumber}}
+            <div class="content-box-button-text" v-for="(value,key) in queryForm.standNumber.split(',')">
+              <a-icon type="file-markdown"/>
+              <span style='text-decoration: underline;cursor:pointer;'   @click='detailClick(queryForm,key)'>{{value}}</span>
+            </div>
           </div>
           <div class="content-box-button-text" v-if="queryForm.targetMarket_dicText">
             <img src="../../../../assets/ditu.png" style="width: 15px;margin-top: -3px" alt="">
@@ -447,6 +449,14 @@
         this.queryForm = row
         this.$refs.SelectedByRef.getPush()
       },
+      detailClick(item,key) {
+        this.$router.push({
+          path: '/docManage/library/detail',
+          query: {
+            id: item.bussDocumentLibraryId.split(',')[key]
+          },
+        })
+      },
       SelectedByForm(userIds) {
         let query = {
           userIds: userIds,

jero-web/src/views/dashboard/components/myList.vue

@@ -94,7 +94,7 @@
       },
       moreClick() {
         this.$router.push({
-          path: '/ProcessCenter'
+          path: '/projectRegulationTasks'
         })
       },
       prcClick(row) {