From beeaf81023defe550d57c53654592bc705ed14d6 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 12 Jul 2022 17:11:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/TermInformation.vue            | 48 +++++++++++++++++--
 .../components/initiatingProcess.vue          |  2 +-
 2 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
index 1ccae18b1..b44281a68 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
@@ -6,14 +6,42 @@
       :data-source="dataList"
       :pagination="false"
       :loading="loading">
-
+      <span slot="evaluationMethod" slot-scope="text,result">
+         <a-tree-select
+           tree-node-filter-prop="title"
+           v-model="result.evaluationMethods"
+           :maxTagCount="1"
+           :getPopupContainer="triggerNode=> triggerNode.parentNode"
+           class="box-input"
+           style="width: 80%;"
+           :tree-data="gatherResultList"
+           tree-checkable
+           :placeholder="$t('PleaseSelect')+$t('evaluationMethod')"
+        />
+      </span>
+      <span slot="Assessor" slot-scope="text,result">
+          <PersonnelSelection class="box-input"
+                              :personneQuery="result"
+                              :query="{db_field_name:'evaluatorIds',db_field_txt:$t('Assessor')}"
+                              :isInput="true"
+                              @change="PersonnelSelectionChange"
+                              v-model="result.evaluatorIdsName"/>
+      </span>
+      <span slot="operation" slot-scope="text,result">
+            <a @click="deleteData(result)">{{$t('delete')}}</a>
+      </span>
     </a-table>
   </div>
 </template>
 
 <script>
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
   export default {
     name: 'TermInformation',
+    components:{
+      PersonnelSelection
+    },
+    props:['gatherResultList'],
     data() {
       return {
         columns: [
@@ -55,16 +83,28 @@
             scopedSlots: { customRender: 'operation' }
           }
         ],
-        dataList: [],
+        dataList: [{}],
         loading: false
       }
     },
     mounted() {
     },
-    methods: {}
+    methods: {
+      deleteData() {
+
+      },
+      PersonnelSelectionChange(value, id) {
+        this.formInline[value] = id
+        this.formInline = { ...this.formInline }
+      },
+    }
   }
 </script>
 
 <style scoped>
-
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
index d51f228f7..29abc1c70 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -155,7 +155,7 @@
             </a-col>
           </a-row>
         </a-form-model>
-        <TermInformation v-if="isTrue"/>
+        <TermInformation :gatherResultList="gatherResultList" v-if="isTrue"/>
         <footerProcess
           @submit="submit"
           :isSubmit="true"

From 97aeca04cd86d75d3e862a856e9147e50ba4c747 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Tue, 12 Jul 2022 17:29:05 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95-=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/ParamsCollectManifestHistoryEOMapper.xml       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml
index 6857bebfa..d59367314 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml
@@ -48,7 +48,9 @@
                 <if test="paramsCollectManifestEO.paramsManifestId !=null and paramsCollectManifestEO.paramsManifestId !=''">
                     AND params_manifest_id = #{paramsCollectManifestEO.paramsManifestId}
                 </if>
-
+                <if test="paramsCollectManifestEO.state !=null and paramsCollectManifestEO.state !=''">
+                    AND state = #{paramsCollectManifestEO.state}
+                </if>
             </if>
         </where>
     </sql>

From 4b6b1005ed955fd33e73498c4c3255b26b29de2c Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 12 Jul 2022 17:44:33 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/tableCollection/index.vue | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index ab50d9fd6..758291e89 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -294,8 +294,15 @@
       onClickSee(val) {
         let _this = this
         this.areaVisibleView = true
+        let url = ''
+        if (this.$route.query.it === undefined) {
+          url = `/jero-boot/params/config/getById?id=${val.db_field_name}`
+        } else {
+          // 历史版本
+          url = `/jero-boot/params/collectManifestHistory/getConfigById?id=${val.db_field_name}`
+        }
         axios({
-          url: `/jero-boot/params/config/getById?id=${val.db_field_name}`,
+          url: url,
           method: 'get',
           transformRequest: [function(data) {
             let ret = ''
@@ -312,8 +319,9 @@
           .then((res) => {
             console.log(res)
             if (res.data.success) {
-              this.configDetail = res.data.result
+              this.configDetail = res.data.result || {}
             } else {
+              this.configDetail = {}
               _this.$message.warning(res.data.result)
             }
           })