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

jero-boot/db/蔚来标准sql/dev_third_record.sql

@@ -958,3 +958,11 @@ DROP INDEX `uniq_sys_user_work_no`;
 -- 工作流 流程表增加流程名称 英文字段  2022-08-19 已同步生产环境
 ALTER TABLE `laws_weilai_wkflow`.`bus_process_name`
     ADD COLUMN `PRC_NAME_EN` varchar(255) NULL COMMENT '流程名称（英文）' AFTER `PROJECT_LAWS_INVENTORY_ID`;
+
+-- 法规月报填写 新增字段  2022-08-25 未同步生产环境
+ALTER TABLE `laws_weilai`.`laws_monthly_report_write`
+ADD COLUMN `related_areas_cn` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关领域中文' AFTER `export_state`,
+ADD COLUMN `related_areas_en` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关领域英文' AFTER `related_areas_cn`,
+ADD COLUMN `source_cn` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源中文' AFTER `related_areas_en`,
+ADD COLUMN `time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期' AFTER `source_cn`,
+ADD COLUMN `source_en` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源英文' AFTER `time`;

jero-boot/jero-boot-modules/pom.xml

@@ -125,6 +125,20 @@
             <groupId>cn.afterturn</groupId>
             <artifactId>easypoi-base</artifactId>
             <version>3.2.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.poi</groupId>
+                    <artifactId>poi-ooxml-schemas</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.poi</groupId>
+                    <artifactId>poi-ooxml</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.poi</groupId>
+                    <artifactId>poi</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>cn.afterturn</groupId>
@@ -220,6 +234,12 @@
             <artifactId>hanlp</artifactId>
             <version>portable-1.7.5</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.xmlbeans</groupId>
+            <artifactId>xmlbeans</artifactId>
+            <version>2.6.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

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

@@ -92,7 +92,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
         	//如果展示权限是公开，则把该数据插入到搜索中心中。
 			this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
 		}
-//		this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
+		this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
     }
 
 	/**
@@ -403,7 +403,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 			//this.deleteElasticsearchData(problemKnowledgeBaseEO.getId());
 		}
 
-//		this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
+		this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
     }
 
 	/**
@@ -439,9 +439,9 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 
         this.problemKnowledgeBaseCommentEOService.remove(deleteWrapper);
 
-//		for (String problemKnowledgeBaseId : ids) {
+		for (String problemKnowledgeBaseId : ids) {
-//			this.deleteElasticsearchData(problemKnowledgeBaseId);
+			this.deleteElasticsearchData(problemKnowledgeBaseId);
-//		}
+		}
     }
 
 	/**

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java

@@ -146,7 +146,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl<LawsMonthl
 		this.updateById(lawsMonthlyReportManageEO);
 
 		// 同步es
-//		syncElasticsearch(id, issueStatus, issueTime);
+		syncElasticsearch(id, issueStatus, issueTime);
 	}
 
 	private void syncElasticsearch(String id, String issueStatus, Date issueTime) {

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

@@ -41,10 +41,7 @@ import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -1186,9 +1183,15 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
             mapHighlight1.put("fields",mapHighlight);
         }
 
-        //封装问题类型选择框查询条件。
+        //封装问题类型选择框查询条件(类似于in条件)。
         if (StringUtils.isNotBlank(problem_type)) {
-            this.createQueryWhere(problem_type,"problem_type",queryMapJson,SearchEnum.INDEX_PROBLEM_KNOWLEDGE_BASE.getValue());
+            List<String> problemTypeList = Arrays.asList(problem_type.split(","));
+
+            Map<String, Object> problemTypeKeyMap = new HashMap<>();
+            Map<String, Object> problemTypeMatchMap = new HashMap<>();
+            problemTypeKeyMap.put("problem_type", problemTypeList);
+            problemTypeMatchMap.put("terms",problemTypeKeyMap);
+            queryMapJson.add(problemTypeMatchMap);
         }
 
         //封装市场选择框查询条件。

jero-web/src/components/globalAdvancedQuery/index.vue

@@ -178,6 +178,7 @@
                   v-model="item.val"
                   :options="item.options"
                   allowClear
+                  class="item-input"
                   :placeholder="$t('pleaseSelect')"
                   :mode="allowMultiple(item)?'multiple':''"
                 />
@@ -191,12 +192,14 @@
                 <a-time-picker v-else-if="item.type==='time'"
                                :value="item.val ? moment(item.val,'HH:mm:ss') : null" format="HH:mm:ss"
                                style="width: 100%;display: inline-block" @change="(time,value)=>item.val=value"/>
-                <a-input-number v-else-if=" item.type=='int'||item.type=='number' " style="width: 100%" :placeholder="$t('pleaseSelect')+$t('numericalValue')" v-model="item.val"/>
+                <a-input-number v-else-if=" item.type=='int'||item.type=='number' "
+                                class="item-input"
+                                style="width: 100%" :placeholder="$t('pleaseSelect')+$t('numericalValue')" v-model="item.val"/>
                 <a-select v-else-if="item.type=='switch'" :placeholder="$t('pleaseSelect')" v-model="item.val">
                   <a-select-option value="Y">{{$t('yes')}}</a-select-option>
                   <a-select-option value="N">{{$t('not')}}</a-select-option>
                 </a-select>
-                <a-input v-else v-model="item.val" :placeholder="$t('EnterValue')"/>
+                <a-input v-else v-model="item.val" class="item-input" :placeholder="$t('EnterValue')"/>
               </a-col>
 
               <a-col :md="4" :xs="0" style="margin-bottom: 12px;">
@@ -748,4 +751,10 @@
   ::v-deep .ant-modal-body{
     overflow-y: visible!important;
   }
+  .item-input{
+     height: 38px;
+  }
+  ::v-deep .ant-select{
+    height: 38px;
+  }
 </style>

jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue

@@ -1324,6 +1324,18 @@
     border: 1px #00B3BE solid;
     color: #00B3BE;
   }
+
+  ::v-deep .ant-select-tree {
+    width: auto;
+    height: 300px;
+    overflow: auto;
+    position: absolute;
+    /*background: #fff;*/
+  }
+
+  ::v-deep .ant-select-tree-dropdown {
+    min-height: 320px;
+  }
 </style>
 
 <style lang="less">

jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue

@@ -7,6 +7,7 @@
             <span class="text-sel" :title="$t('problemClassification')">{{$t('problemClassification')}}</span>
             <a-select :placeholder="$t('PleaseSelect')+$t('problemClassification')"
                       class="text-select"
+                      mode="multiple"
                       :getPopupContainer="triggerNode=> triggerNode.parentNode"
                       allowClear
                       v-model="queryParamOne.problem_type">

jero-web/src/views/documentTools/searchCenter/index.vue

@@ -65,10 +65,10 @@
                 <a-tab-pane :key="$t('whole')" :tab="$t('whole')"></a-tab-pane>
                 <a-tab-pane :key="$t('DocumentLibrary')" :tab="$t('DocumentLibrary')" force-render>
                 </a-tab-pane>
-<!--                <a-tab-pane :key="$t('problemKnowledgeBase')" :tab="$t('problemKnowledgeBase')" force-render>-->
+                <a-tab-pane :key="$t('problemKnowledgeBase')" :tab="$t('problemKnowledgeBase')" force-render>
-<!--                </a-tab-pane>-->
+                </a-tab-pane>
-<!--                <a-tab-pane :key="$t('monthlyReportRegulations')" :tab="$t('monthlyReportRegulations')" force-render>-->
+                <a-tab-pane :key="$t('monthlyReportRegulations')" :tab="$t('monthlyReportRegulations')" force-render>
-<!--                </a-tab-pane>-->
+                </a-tab-pane>
               </a-tabs>
             </div>
           </div>

jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue

@@ -79,10 +79,14 @@
         <span slot="sponsorFeedback" slot-scope="text,result">
              <a-textarea :placeholder="$t('pleaseEnter')+$t('sponsorFeedback')"
                          v-model.trim="result.sponsorFeedback"
+                         :title="result.sponsorFeedback"
                          onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
                          :maxLength="300"
                          :rows="2"/>
         </span>
+        <span slot="sponsorFeedbackIndex" :title="text" slot-scope="text,result">
+              {{text ? text : '--'}}
+        </span>
       </a-table>
     </div>
     <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
@@ -193,6 +197,14 @@
             align: 'center',
             width: 180,
             scopedSlots: { customRender: 'complianceResults' }
+          },
+          {
+            title: this.$t('sponsorFeedback'),
+            dataIndex: 'sponsorFeedback',
+            align: 'center',
+            width: 180,
+            ellipsis: true,
+            scopedSlots: { customRender: 'sponsorFeedbackIndex' }
           }
         ],
         columnsThree: [

jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue

@@ -112,7 +112,7 @@
                 {{$t('edit')}}
           </a>
         </span>
-        <span slot="regulatoryEngineer" >
+        <span slot="regulatoryEngineer">
             <span :title="$t('regulatoryEngineer')">
               {{$t('regulatoryEngineer')}}
             </span>
@@ -218,6 +218,7 @@
                 <!--                :prop="'certificationEngineer'"-->
                 <a-form-model-item class="itemModel">
                   <a-select allowClear
+                            class="box-input"
                             v-model="formInline.certificationEngineer"
                             :placeholder="$t('certifiedEngineer')+$t('areaOfResponsibility')">
                     <a-select-option v-for="(item, key) in dictOptionsValue"
@@ -283,18 +284,18 @@
           {
             align: 'center',
             dataIndex: 'lawEngineerName',
-            slots:{title:'regulatoryEngineer'},
+            slots: { title: 'regulatoryEngineer' },
             ellipsis: true
           },
           {
             align: 'center',
-            slots:{title:'engineeringInterfacePerson'},
+            slots: { title: 'engineeringInterfacePerson' },
             dataIndex: 'engineeringInterfacePersonName',
             ellipsis: true
           },
           {
             align: 'center',
-            slots:{title:'certifiedEngineer'},
+            slots: { title: 'certifiedEngineer' },
             dataIndex: 'certificationEngineerName',
             ellipsis: true
           },
@@ -417,10 +418,10 @@
         this.selectedRowKeys = []
         this.getList()
       },
-      handleCancel(){
+      handleCancel() {
         this.visible = false
       },
-      handleSubmit(){
+      handleSubmit() {
         this.visible = false
       },
       batSettingClick() {
@@ -469,6 +470,9 @@
         this.editVisible = true
         this.$nextTick(() => {
           this.formInline = JSON.parse(JSON.stringify(item))
+          if (!(this.dictOptionsValue.some(val => val.certificationEngineer == this.formInline.certificationEngineer))) {
+            this.formInline.certificationEngineer = undefined
+          }
           this.$refs.ruleForm.clearValidate()
         })
       },
@@ -642,11 +646,12 @@
     height: 38px;
     /*margin-top: 2px;*/
   }
+
   .drawer-bootom-button {
     position: absolute;
     bottom: 0;
     width: 100%;
-    z-index:100;
+    z-index: 100;
     border-top: 1px solid #e8e8e8;
     padding: 10px 16px;
     text-align: right;