From 3d7533dd4c9dc887f4a60e4cef4735d0eea0a3aa Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 17 Jun 2022 18:14:44 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=A1=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/search/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue
index 392b46c09..f8f97fe0e 100644
--- a/jero-web/src/components/search/index.vue
+++ b/jero-web/src/components/search/index.vue
@@ -241,7 +241,7 @@
   }
 
   .box-input {
-    min-width: 200px;
+    /*min-width: 200px;*/
     display: inline-block;
     width: 70%;
     height: 38px;

From 66b658f2c6ae38e194e6c6f5c4d73f893298f150 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 17 Jun 2022 18:27:20 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E6=97=B6=E9=97=B4=E5=88=A4=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index 24ddb5449..a674d8386 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -608,10 +608,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             if ("issue_time".equals(onlCgformField.getDbFieldName())) {
                 map.put("sort", "true");//列表排序标识
             }
-//            if ("issue_time".equals(onlCgformField.getDbFieldName())
-//                    || "implement_time".equals(onlCgformField.getDbFieldName())) {
-//                map.put("sort", "true");//列表排序标识
-//            }
             map.put("db_field_name", onlCgformField.getDbFieldName());//字段
             if (CutEnum.CN.getValue().equals(cut)) {
                 map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
@@ -1592,16 +1588,19 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
             String issueTime = (String) (map.get("issue_time"));
-            Date issueTimeDate = df.parse(issueTime);
+            Date issueTimeDate = null;
+            if(StringUtils.isNotBlank(issueTime)){
+                issueTimeDate = df.parse(issueTime);
+            }
             String implementTime = (String) map.get("implement_time");//在产车实施日期
             String newCarimplementTime = (String) map.get("xin1_che1_xing2_shi2_shi1_ri4_qi1");//新车型实施日期
-            if (StringUtils.isNotBlank(implementTime)) {
+            if (StringUtils.isNotBlank(implementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
                 Date implementTimeDate = df.parse(implementTime);
                 if (issueTimeDate.after(implementTimeDate)) {
                     throw new JeroBootException("发布日期不能大于在产车实施日期");
                 }
             }
-            if (StringUtils.isNotBlank(newCarimplementTime)) {
+            if (StringUtils.isNotBlank(newCarimplementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
                 Date newCarimplementTimeDate = df.parse(newCarimplementTime);
                 if (issueTimeDate.after(newCarimplementTimeDate)) {
                     throw new JeroBootException("发布日期不能大于新车型实施日期");
@@ -2201,16 +2200,19 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         try {
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
             String issueTime = (String) map.get("issue_time");
-            Date issueTimeDate = df.parse(issueTime);
+            Date issueTimeDate = null;
+            if(StringUtils.isNotBlank(issueTime)){
+                issueTimeDate = df.parse(issueTime);
+            }
             String implementTime = (String) map.get("implement_time");//在产车实施日期
             String newCarimplementTime = (String) map.get("xin1_che1_xing2_shi2_shi1_ri4_qi1");//新车型实施日期
-            if (StringUtils.isNotBlank(implementTime)) {
+            if (StringUtils.isNotBlank(implementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
                 Date implementTimeDate = df.parse(implementTime);
                 if (issueTimeDate.after(implementTimeDate)) {
                     throw new JeroBootException("发布日期不能大于在产车实施日期");
                 }
             }
-            if (StringUtils.isNotBlank(newCarimplementTime)) {
+            if (StringUtils.isNotBlank(newCarimplementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
                 Date newCarimplementTimeDate = df.parse(newCarimplementTime);
                 if (issueTimeDate.after(newCarimplementTimeDate)) {
                     throw new JeroBootException("发布日期不能大于新车型实施日期");

From 501be4a656ffefb9a39841894ddb9fe74278c239 Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Fri, 17 Jun 2022 18:31:36 +0800
Subject: [PATCH 3/5] =?UTF-8?q?[update]=20=E6=8B=86=E5=88=86=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/searchalonesplit/index.vue |   2 +-
 .../src/components/searchalonetext/index.vue  | 255 ++++++++++++++++++
 .../splitting/modules/ImportResult.vue        |   2 +-
 .../splitting/modules/SplitText.vue           |   8 +-
 4 files changed, 261 insertions(+), 6 deletions(-)
 create mode 100644 jero-web/src/components/searchalonetext/index.vue

diff --git a/jero-web/src/components/searchalonesplit/index.vue b/jero-web/src/components/searchalonesplit/index.vue
index cb5332960..2d51da06b 100644
--- a/jero-web/src/components/searchalonesplit/index.vue
+++ b/jero-web/src/components/searchalonesplit/index.vue
@@ -1,7 +1,7 @@
 <template>
   <a-form layout="inline" @keyup.enter.native="searchQuery">
     <a-row :gutter="24">
-      <a-col :md="10" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
+      <a-col :md="6" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
         <template v-if="index < 3">
           <div class="box-title-text" v-if="item.field_show_type == '0'">
             <div class="title-text" :title="item.db_field_txt">
diff --git a/jero-web/src/components/searchalonetext/index.vue b/jero-web/src/components/searchalonetext/index.vue
new file mode 100644
index 000000000..323765aa6
--- /dev/null
+++ b/jero-web/src/components/searchalonetext/index.vue
@@ -0,0 +1,255 @@
+<template>
+  <a-form layout="inline" @keyup.enter.native="searchQuery">
+    <a-row :gutter="24">
+      <a-col :md="10" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
+        <template v-if="index < 3">
+          <div class="box-title-text" v-if="item.field_show_type == '0'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-tree-select
+              tree-node-filter-prop="title"
+              class="box-input"
+              v-model="queryParam[item.db_field_name]"
+              :maxTagCount="1"
+              :getPopupContainer="triggerNode=> triggerNode.parentNode"
+              :tree-data="item.tree"
+              tree-checkable
+              :placeholder="$t('PleaseSelect')+item.db_field_txt"
+            />
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '1' || item.field_show_type == '8' ||
+          item.field_show_type == '9' || item.field_show_type == '10' || item.field_show_type == '11'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                     v-model="queryParam[item.db_field_name]"></a-input>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '2'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input-number class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                            v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '4'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-multi-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                                :placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'"
+                                :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '6' || item.field_show_type == '5'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-range-picker class="box-input" v-model="queryParam[item.db_field_name]"
+                            :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                            @change="onChange(item.db_field_name)"></a-range-picker>
+          </div>
+          <!--          <div class="box-title-text" v-else-if="item.field_show_type == '5'">-->
+          <!--            <div class="title-text" :title="item.db_field_txt">-->
+          <!--              <span>{{item.db_field_txt}}</span>-->
+          <!--            </div>-->
+          <!--            <a-date-picker class="box-input"-->
+          <!--                           :placeholder="$t('PleaseSelect')+item.db_field_txt"-->
+          <!--                           @change="dateChange(item.db_field_name)"-->
+          <!--                           v-model="queryParam[item.db_field_name]"/>-->
+          <!--          </div>-->
+          <div class="box-title-text" v-else-if="item.field_show_type == '3'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-dict-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                               :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                               :type="'select'"
+                               :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+        </template>
+
+        <template v-if="index >= 3 && toggleSearchStatus">
+          <div class="box-title-text" v-if="item.field_show_type == '0'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-tree-select
+              tree-node-filter-prop="title"
+              class="box-input"
+              v-model="queryParam[item.db_field_name]"
+              :maxTagCount="1"
+              :getPopupContainer="triggerNode=> triggerNode.parentNode"
+              :tree-data="item.tree"
+              tree-checkable
+              :placeholder="$t('PleaseSelect')+item.db_field_txt"
+            />
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '1' || item.field_show_type == '8' ||
+          item.field_show_type == '9' || item.field_show_type == '10' || item.field_show_type == '11'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                     v-model="queryParam[item.db_field_name]"></a-input>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '2'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input-number class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                            v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '4'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-multi-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                                :placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'"
+                                :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '6' || item.field_show_type == '5'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-range-picker class="box-input" v-model="queryParam[item.db_field_name]"
+                            @change="onChange(item.db_field_name)"></a-range-picker>
+          </div>
+          <!--          <div class="box-title-text" v-else-if="item.field_show_type == '5'">-->
+          <!--            <div class="title-text" :title="item.db_field_txt">-->
+          <!--              <span>{{item.db_field_txt}}</span>-->
+          <!--            </div>-->
+          <!--            <a-date-picker class="box-input"-->
+          <!--                           :placeholder="$t('PleaseSelect')+item.db_field_txt"-->
+          <!--                           @change="dateChange(item.db_field_name)"-->
+          <!--                           v-model="queryParam[item.db_field_name]"/>-->
+          <!--          </div>-->
+          <div class="box-title-text" v-else-if="item.field_show_type == '3'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-dict-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                               :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                               :type="'select'"
+                               :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+        </template>
+
+      </a-col>
+      <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+         <a-col :md="6" :sm="24">
+            <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+            <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+          <a @click="handleToggleSearch" style="margin-left: 8px" v-if="searchList.length > 3">
+            {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+          </a>
+         </a-col>
+      </span>
+    </a-row>
+  </a-form>
+</template>
+
+<script>
+import { getAction } from '@/api/manage'
+import eventBUs from '../../common/event.js'
+import moment from 'moment'
+
+export default {
+  name: 'index',
+  props: {
+    url: {
+      type: Object,
+      default: {}
+    },
+    flag: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      queryParam: {},
+      toggleSearchStatus: false,
+      searchList: []
+    }
+  },
+  mounted() {
+    this.getSeach()
+  },
+  methods: {
+    searchQuery() {
+      eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
+    },
+    searchReset() {
+      this.queryParam = {}
+      eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
+    },
+    getSeach() {
+      let params = {
+        flag: this.flag
+      }
+      getAction(this.url.seachList, params).then((res) => {
+        if (res.success) {
+          this.searchList = res.result
+        }
+      })
+    },
+    // handleToggleSearch() {
+    //   this.toggleSearchStatus = !this.toggleSearchStatus
+    // },
+    dateChange(item) {
+      this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD')
+    },
+    onChange(item) {
+      if (this.queryParam[item] && this.queryParam[item].length > 0) {
+        let dateOne = moment(this.queryParam[item][0]).format('YYYY-MM-DD')
+        let dateTwo = moment(this.queryParam[item][1]).format('YYYY-MM-DD')
+        this.queryParam[item] = [dateOne, dateTwo]
+      } else {
+        this.queryParam[item] = []
+      }
+    },
+    handleToggleSearch() {
+      this.toggleSearchStatus = !this.toggleSearchStatus
+    }
+  }
+}
+</script>
+
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.title-text {
+  width: 20%;
+  min-width: 110px;
+  color: #000F16;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.box-input {
+  min-width: 200px;
+  display: inline-block;
+  width: 70%;
+  height: 38px;
+  margin-top: 2px;
+}
+
+.box-button {
+  height: 38px;
+  /*margin-top: 2px;*/
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
index 971a0cf16..bd2816cf4 100644
--- a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
@@ -60,7 +60,7 @@
 <script>
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
   import SplitUpload from '@/components/importSplitUpload/index'
-  import search from '@/components/search/index'
+  import search from '@/components/searchalonetext/index'
   import TableData from '@/components/SplitTable/DocTable'
   import axios from 'axios'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue
index b9f50045f..db7c64dfc 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue
@@ -11,7 +11,7 @@
       >
         <div class="split-table-content">
           <div class="split-header">
-            <search :url="url" :flag="'condition'"></search>
+            <searchAlone :url="url" :flag="'condition'"></searchAlone>
           </div>
         </div>
         <div class="table-operator operator-select">
@@ -21,7 +21,7 @@
 
             <div  class="operator-select-type">
               <span class="operator-file-type"><i class="operator-i">*</i>{{$t('fileType')}}</span>
-              <a-select v-model="fileGroup" :placeholder="$t('selectFileType')" class="file-type-select">
+              <a-select v-model="fileGroup" style='min-width: 295px' :placeholder="$t('selectFileType')" class="file-type-select">
                 <a-select-option value="GSO" key="GSO" :title="$t('GSO')">
                   {{$t('GSO')}}
                 </a-select-option>
@@ -75,7 +75,7 @@
 
 <script>
   import { getAction, postAction } from '../../../../api/manage'
-  import search from '@/components/search/index'
+  import SearchAlone from '@/components/searchalonetext/index'
   import TableData from '@/components/SplitTable/DocTable'
   import eventBUs from '../../../../common/event'
   import Vue from 'vue'
@@ -86,7 +86,7 @@
   export default {
     name: 'split',
     components:{
-      search,
+      SearchAlone,
       TableData,
     },
     data(){

From efa9d298bfa2504724ce38613a10df7b4237af7e Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Fri, 17 Jun 2022 18:41:24 +0800
Subject: [PATCH 4/5] =?UTF-8?q?[update]=20orc=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/searchaloneorcfile/index.vue   | 254 ++++++++++++++++++
 .../documentManage/ocr/modules/DocTable.vue   |   6 +-
 2 files changed, 257 insertions(+), 3 deletions(-)
 create mode 100644 jero-web/src/components/searchaloneorcfile/index.vue

diff --git a/jero-web/src/components/searchaloneorcfile/index.vue b/jero-web/src/components/searchaloneorcfile/index.vue
new file mode 100644
index 000000000..4a65293a5
--- /dev/null
+++ b/jero-web/src/components/searchaloneorcfile/index.vue
@@ -0,0 +1,254 @@
+<template>
+  <a-form layout="inline" @keyup.enter.native="searchQuery">
+    <a-row :gutter="24">
+      <a-col :md="10" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
+        <template v-if="index < 3">
+          <div class="box-title-text" v-if="item.field_show_type == '0'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-tree-select
+              tree-node-filter-prop="title"
+              class="box-input"
+              v-model="queryParam[item.db_field_name]"
+              :maxTagCount="1"
+              :getPopupContainer="triggerNode=> triggerNode.parentNode"
+              :tree-data="item.tree"
+              tree-checkable
+              :placeholder="$t('PleaseSelect')+item.db_field_txt"
+            />
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '1' || item.field_show_type == '8' ||
+          item.field_show_type == '9' || item.field_show_type == '10' || item.field_show_type == '11'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                     v-model="queryParam[item.db_field_name]"></a-input>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '2'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input-number class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                            v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '4'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-multi-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                                :placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'"
+                                :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '6' || item.field_show_type == '5'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-range-picker class="box-input" v-model="queryParam[item.db_field_name]"
+                            :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                            @change="onChange(item.db_field_name)"></a-range-picker>
+          </div>
+          <!--          <div class="box-title-text" v-else-if="item.field_show_type == '5'">-->
+          <!--            <div class="title-text" :title="item.db_field_txt">-->
+          <!--              <span>{{item.db_field_txt}}</span>-->
+          <!--            </div>-->
+          <!--            <a-date-picker class="box-input"-->
+          <!--                           :placeholder="$t('PleaseSelect')+item.db_field_txt"-->
+          <!--                           @change="dateChange(item.db_field_name)"-->
+          <!--                           v-model="queryParam[item.db_field_name]"/>-->
+          <!--          </div>-->
+          <div class="box-title-text" v-else-if="item.field_show_type == '3'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-dict-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                               :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                               :type="'select'"
+                               :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+        </template>
+
+        <template v-if="index >= 3 && toggleSearchStatus">
+          <div class="box-title-text" v-if="item.field_show_type == '0'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-tree-select
+              tree-node-filter-prop="title"
+              class="box-input"
+              v-model="queryParam[item.db_field_name]"
+              :maxTagCount="1"
+              :getPopupContainer="triggerNode=> triggerNode.parentNode"
+              :tree-data="item.tree"
+              tree-checkable
+              :placeholder="$t('PleaseSelect')+item.db_field_txt"
+            />
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '1' || item.field_show_type == '8' ||
+          item.field_show_type == '9' || item.field_show_type == '10' || item.field_show_type == '11'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                     v-model="queryParam[item.db_field_name]"></a-input>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '2'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input-number class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                            v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '4'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-multi-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                                :placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'"
+                                :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '6' || item.field_show_type == '5'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-range-picker class="box-input" v-model="queryParam[item.db_field_name]"
+                            @change="onChange(item.db_field_name)"></a-range-picker>
+          </div>
+          <!--          <div class="box-title-text" v-else-if="item.field_show_type == '5'">-->
+          <!--            <div class="title-text" :title="item.db_field_txt">-->
+          <!--              <span>{{item.db_field_txt}}</span>-->
+          <!--            </div>-->
+          <!--            <a-date-picker class="box-input"-->
+          <!--                           :placeholder="$t('PleaseSelect')+item.db_field_txt"-->
+          <!--                           @change="dateChange(item.db_field_name)"-->
+          <!--                           v-model="queryParam[item.db_field_name]"/>-->
+          <!--          </div>-->
+          <div class="box-title-text" v-else-if="item.field_show_type == '3'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-dict-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                               :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                               :type="'select'"
+                               :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+        </template>
+
+      </a-col>
+      <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+         <a-col :md="4" :sm="24" style='display: flex'>
+            <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+            <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+          <a @click="handleToggleSearch" style="margin-left: 8px" v-if="searchList.length > 3">
+            {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+          </a>
+         </a-col>
+      </span>
+    </a-row>
+  </a-form>
+</template>
+
+<script>
+import { getAction } from '@/api/manage'
+import eventBUs from '../../common/event.js'
+import moment from 'moment'
+
+export default {
+  name: 'index',
+  props: {
+    url: {
+      type: Object,
+      default: {}
+    },
+    flag: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      queryParam: {},
+      toggleSearchStatus: false,
+      searchList: []
+    }
+  },
+  mounted() {
+    this.getSeach()
+  },
+  methods: {
+    searchQuery() {
+      eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
+    },
+    searchReset() {
+      this.queryParam = {}
+      eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
+    },
+    getSeach() {
+      let params = {
+        flag: this.flag
+      }
+      getAction(this.url.seachList, params).then((res) => {
+        if (res.success) {
+          this.searchList = res.result
+        }
+      })
+    },
+    // handleToggleSearch() {
+    //   this.toggleSearchStatus = !this.toggleSearchStatus
+    // },
+    dateChange(item) {
+      this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD')
+    },
+    onChange(item) {
+      if (this.queryParam[item] && this.queryParam[item].length > 0) {
+        let dateOne = moment(this.queryParam[item][0]).format('YYYY-MM-DD')
+        let dateTwo = moment(this.queryParam[item][1]).format('YYYY-MM-DD')
+        this.queryParam[item] = [dateOne, dateTwo]
+      } else {
+        this.queryParam[item] = []
+      }
+    },
+    handleToggleSearch() {
+      this.toggleSearchStatus = !this.toggleSearchStatus
+    }
+  }
+}
+</script>
+
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.title-text {
+  width: 20%;
+  min-width: 110px;
+  color: #000F16;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.box-input {
+  display: inline-block;
+  width: 70%;
+  height: 38px;
+  margin-top: 2px;
+}
+
+.box-button {
+  height: 38px;
+  /*margin-top: 2px;*/
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/ocr/modules/DocTable.vue b/jero-web/src/views/documentManage/ocr/modules/DocTable.vue
index bbf73d4f6..48e2e80e8 100644
--- a/jero-web/src/views/documentManage/ocr/modules/DocTable.vue
+++ b/jero-web/src/views/documentManage/ocr/modules/DocTable.vue
@@ -11,7 +11,7 @@
       >
         <div class="doc-table-content">
           <div class="doc-header">
-            <searchaloneorc :url="url" :flag="'condition'"></searchaloneorc>
+            <searchaloneorcFile :url="url" :flag="'condition'"></searchaloneorcFile>
           </div>
         </div>
         <div class="doc-table-detail">
@@ -34,13 +34,13 @@
 
 <script>
   import { getAction, postAction, deleteAction } from '@/api/manage'
-  import searchaloneorc from '@/components/searchaloneorc/index'
+  import SearchaloneorcFile from '@/components/searchaloneorcfile/index'
   import TableData from '@/components/OcrTable/DocTable'
   import eventBUs from '../../../../common/event'
   export default {
     name: 'docTable',
     components:{
-      searchaloneorc,
+      SearchaloneorcFile,
       TableData,
 
     },

From 8c25d0680eab696851fcbd0efeac37c5d8a33476 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Sat, 18 Jun 2022 14:42:52 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9--?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/NcrTrackServiceImpl.java     | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

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 a2e713672..b32f22693 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
@@ -34,10 +34,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
@@ -75,9 +76,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
             ncrTrackVO.setTitle(ncrTrackVO.getTitle().replace("*",""));
         }
 //        List<SysUser> sysUserList = sysUserService.list();
-        QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
-        userQueryWrapper.select("id", "username");
-        List<SysUser> sysUserList = this.sysUserService.list(userQueryWrapper);
+
 
         ncrTrackVO.setInconformity(ReviewResultEnum.INCONFORMITY.getValue());
         ncrTrackVO.setTrack(ReviewResultEnum.TO_TRACK.getValue());
@@ -97,6 +96,25 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
             verifyName = "Verify conformance validation";
         }
         List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
+        Set<String> userIdSet = new HashSet<>();
+        for (NcrTrackVO trackVO : infoList) {
+            if(StringUtils.isNotBlank(trackVO.getDesignInitiatorId())){
+                userIdSet.add(trackVO.getDesignInitiatorId());
+            }
+            if(StringUtils.isNotBlank(trackVO.getPrehomoInitiatorId())){
+                userIdSet.add(trackVO.getPrehomoInitiatorId());
+            }
+            if(StringUtils.isNotBlank(trackVO.getVerifyInitiatorId())){
+                userIdSet.add(trackVO.getVerifyInitiatorId());
+            }
+        }
+        List<SysUser> sysUserList = new ArrayList<>();
+        if(userIdSet.size() != 0){
+            QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
+            userQueryWrapper.lambda().in(SysUser::getId,userIdSet);
+            userQueryWrapper.select("id", "username");
+            sysUserList = this.sysUserService.list(userQueryWrapper);
+        }
         for (NcrTrackVO trackVO : infoList) {
             //责任领域中英文切换
             if(StringUtils.isNotBlank(trackVO.getDutyTerritory())){