From 963365cbdc78d42657fd564650dd93e06738a743 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Mon, 11 Jul 2022 09:21:01 +0800
Subject: [PATCH 001/103] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=93-=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC=E5=87=BAword?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/service/impl/ParamsReportDetailEOServiceImpl.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
index 60754ba17..ae409e6dc 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
@@ -902,6 +902,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 	}
 
 	private List<Map> queryForExportCustom(ParamsReportDetailVO paramsReportDetailVO) {
+		paramsReportDetailVO.setSeparator("&"); // 设置分隔符
+
 		List<String> idList = new ArrayList<>();
 		if (StringUtils.isNotEmpty(paramsReportDetailVO.getIds())) {
 			idList = Arrays.asList(paramsReportDetailVO.getIds().split(","));

From 8868cf0829acc2e58eadd98cbf0affabd51c34ba Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 11 Jul 2022 11:02:48 +0800
Subject: [PATCH 002/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   1 +
 jero-web/src/common/lang/zh-cn.js             |   1 +
 jero-web/src/components/layouts/TabLayout.vue |   1 +
 jero-web/src/config/router.config.js          |   5 +
 .../components/initiatingProcess.vue          | 447 ++++++++++++++++++
 .../technologyAssessment/index.vue            | 351 ++++++++++++++
 6 files changed, 806 insertions(+)
 create mode 100644 jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
 create mode 100644 jero-web/src/views/businessSupport/technologyAssessment/index.vue

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 9c72de433..2db63ba8e 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1106,4 +1106,5 @@ module.exports = {
   PreHomoNotification:'Pre-Homo Notification',
   ValidationComplianceNotification:'Validation Compliance Notification',
   RegulationTaskConfirmationNotification:'Regulation Task Confirmation Notification',
+  evaluationMethod:'Evaluation method',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 36383260f..82611fe55 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1110,4 +1110,5 @@ module.exports = {
   PreHomoNotification:'Pre-Homo通知',
   ValidationComplianceNotification:'验证符合性通知',
   RegulationTaskConfirmationNotification:'任务确认通知',
+  evaluationMethod:'评估方式',
 }
\ No newline at end of file
diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue
index bd131a3ca..63efafd77 100644
--- a/jero-web/src/components/layouts/TabLayout.vue
+++ b/jero-web/src/components/layouts/TabLayout.vue
@@ -97,6 +97,7 @@
           this.$route.path == '/handshakeProcess' ||
           this.$route.path == '/projectStatusAndProgress' ||
           this.$route.path == '/TaskPlanList' ||
+          this.$route.path == '/evaluationInitiationProcess' ||
           this.$route.path == '/historicalVersion' ||
           this.$route.path == '/dashboard/analysis' ||
           this.$route.path == '/processDetails') {
diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js
index bbe11e197..6c5c7f1d2 100644
--- a/jero-web/src/config/router.config.js
+++ b/jero-web/src/config/router.config.js
@@ -342,6 +342,11 @@ export const constantRouterMap = [
     name: 'initiatingProcess',
     component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess')
   },
+  {
+    path: '/evaluationInitiationProcess',
+    name: 'evaluationInitiationProcess',
+    component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/technologyAssessment/components/initiatingProcess')
+  },
   // {
   //   path: '/ParameterItemCollection',
   //   name: 'ParameterItemCollection',
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
new file mode 100644
index 000000000..66b030e9c
--- /dev/null
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -0,0 +1,447 @@
+<template>
+  <div id="examineBox">
+    <headerProcess
+      :title="title"
+    />
+    <div class="detail-box">
+      <div class="detail-content" style="padding: 20px">
+        <div class="table-page-search-wrapper">
+          <search ref="searchRef"
+                  :flag="'1'"
+                  :url="url"/>
+        </div>
+        <a-table
+          ref="table"
+          size="middle"
+          :loading="loading"
+          :pagination="false"
+          :scroll="{x: '100%'}"
+          rowKey="id"
+          :data-source="dataSource"
+          :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange ,columnTitle:' '}"
+          :columns="columns"
+        >
+        </a-table>
+        <div class="page" v-if="dataSource && dataSource.length > 0">
+          <a-pagination
+            :show-total="total => $t('total')+` ${total} `+$t('strip')"
+            show-quick-jumper
+            :page-size.sync="pageSize"
+            :total="total"
+            :current="pageNo"
+            @change="pageOnChange"
+            @showSizeChange="SizeChange"
+          />
+        </div>
+        <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('closingDate')">{{$t('closingDate')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="endTime">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+$t('closingDate')"
+                                 @change="dateChange('endTime')"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 format="YYYY-MM-DD"
+                                 v-model="formInline['endTime']"
+                                 style="width: 100%"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('Assessor')">{{$t('Assessor')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="evaluatorIdsName">
+                  <PersonnelSelection class="box-input"
+                                      :personneQuery="formInline"
+                                      :query="{db_field_name:'evaluatorIds',db_field_txt:$t('Assessor')}"
+                                      :isInput="true"
+                                      @change="PersonnelSelectionChange"
+                                      v-model="formInline.evaluatorIdsName"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('taskDescription')">{{$t('taskDescription')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="taskExplain">
+                  <a-textarea :placeholder="$t('pleaseEnter')+$t('taskDescription')"
+                              v-model="formInline.taskExplain"
+                              :rows="4"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="accessory_id">
+                  <a-button type="primary" class="button-text"
+                            @click="clickButtonToUpload('accessory_id')">
+                    {{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' ||
+                    formInline.accessory_id == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                    }}
+                  </a-button>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+        </a-form-model>
+        <footerProcess
+          @submit="submit"
+          :isSubmit="true"
+        />
+      </div>
+    </div>
+    <JLoading :loading="JLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
+    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
+  </div>
+</template>
+
+<script>
+  import headerProcess from '../../../processCenter/components/headerProcess'
+  import search from '@/components/search/index'
+  import uploadFile from '@/components/uploadFile/file'
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import footerProcess from '../../../processCenter/components/footerProcess'
+  import { getAction, postAction } from '@/api/manage'
+  import moment from 'moment'
+  import eventBUs from '../../../../common/event'
+  import { mapGetters } from 'vuex'
+
+  export default {
+    name: 'evaluationInitiationProcess',
+    components: {
+      headerProcess,
+      search,
+      uploadFile,
+      footerProcess,
+      PersonnelSelection
+    },
+    data() {
+      return {
+        title: this.$t('regulatoryEngineer') + this.$t('initiatingProcess'),
+        //url传参严格按照当前命名
+        url: {
+          seachList: 'document/bussDocumentLibraryEO/queryCondition',   //搜索字段
+          addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy'
+        },
+        loading: false,
+        JLoading:false,
+        dataSource: [],
+        selectedRowKeys: [],
+        total: 0,
+        pageSize: 10,
+        pageNo: 1,
+        formInline: {},
+        rules: {
+          endTime: [
+            {
+              required: true,
+              message: this.$t('closingDate') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          evaluatorIdsName: [
+            {
+              required: true,
+              message: this.$t('Assessor') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ]
+        },
+        searchParmes: {},
+        selectedRowKeysRecord: [],
+        columns: [
+          {
+            title: this.$t('standard'),
+            align: 'center',
+            dataIndex: 'serial_number',
+            width: 170,
+            scopedSlots: { customRender: 'serial_number' }
+          },
+          {
+            title: this.$t('title'),
+            align: 'center',
+            dataIndex: 'title',
+            width: 170,
+            scopedSlots: { customRender: 'titleName' }
+          },
+          {
+            title: this.$t('status'),
+            align: 'center',
+            width: 140,
+            ellipsis: true,
+            dataIndex: 'state'
+          },
+          {
+            title: this.$t('zoneOfApplication'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'region'
+          },
+          {
+            title: this.$t('technicalField'),
+            align: 'center',
+            ellipsis: true,
+            width: 170,
+            dataIndex: 'technology_territory'
+          },
+          {
+            title: this.$t('correspondingStandard'),
+            align: 'center',
+            ellipsis: true,
+            width: 170,
+            dataIndex: 'corresponding_standard'
+          }
+        ]
+      }
+    },
+    mounted() {
+      document.title = this.$t('regulatoryEngineer') + this.$t('initiatingProcess')
+      this.getList()
+      eventBUs.$on('searchQuery', search => {
+        Object.keys(search).forEach(res => {
+          if (search[res] instanceof Array) {
+            search[res] = search[res].join(',')
+          }
+        })
+        this.pageNo = 1
+        this.searchParmes = search
+        this.getList()
+      })
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...this.searchParmes
+        }
+        this.loading = true
+        postAction(this.url.addModelList, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.dataSource = []
+            this.total = 0
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value, record) {
+        this.selectedRowKeys = value
+        if (this.selectedRowKeys.length > 1) {
+          this.selectedRowKeys.shift()
+          record.shift()
+        }
+        this.selectedRowKeysRecord = record
+      },
+      clickButtonToUpload(item) {
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+        this.uploadName = item
+        getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+          if (res.success) {
+            this.$refs.uploadFile.perentHandleFunc(res.result)
+          } else {
+            this.$refs.uploadFile.perentHandleFunc()
+          }
+        })
+      },
+      /** 上传文件的回调 */
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push(item.id || data.name)
+          })
+        }
+        /** 赋值给当前对应的表单文件 */
+        this.formInline[this.uploadName] = attIdList.join(',')
+        this.formInline = { ...this.formInline }
+      },
+      PersonnelSelectionChange(value, id) {
+        this.formInline[value] = id
+        this.formInline = { ...this.formInline }
+      },
+      dateChange(item) {
+        this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : ''
+      },
+      getUUID(){
+        var str=[];
+        var Chars='0123456789abcdefghijklmnopqrstuvwxyz';
+        for(var i=0;i<36;i++){
+          str[i]=Chars.substr(Math.floor(Math.random()*16),1)
+        }
+        str[0]=str[8]=str[13]=str[18]=str[23]='-';
+        return str.join("")
+      },
+      submit() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length == 0) {
+              this.$message.warning(this.$t('pleaseSelectStandard'))
+            } else {
+              this.JLoading = true
+              let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0])
+              value.standId = value.id
+              value.taskAffirmDueDate = value.endTime
+              delete value.id
+              value.id = this.getUUID()
+              value.currentUserName = this.userInfo().username
+              Object.keys(value).forEach(res => {
+                if (value[res] && value[res] instanceof String) {
+                  value[res] = value[res].replace(/\"/g, '“')
+                  value[res] = value[res].replace(/\'/g, '‘')
+                }
+              })
+              this.startProcess(value)
+            }
+          }
+        })
+      },
+      startProcess(value) {
+        let query = {
+          type: 5,
+          msg: JSON.stringify(value).replace(/\"/g, '\'')
+        }
+        postAction('/workFlow/startProcess', query).then((res) => {
+          if (res.success) {
+            this.completeTask(value, res.result)
+          }else{
+            this.JLoading = false
+          }
+        })
+      },
+      completeTask(value, taskId) {
+        let query = {
+          userid: this.userInfo().id,
+          taskId: taskId,
+          json: JSON.stringify(value).replace(/\"/g, '\'')
+        }
+        postAction('/workFlow/completeTask', query).then((res) => {
+          if (res.success) {
+            // setTimeout(() => {
+            //   window.close()
+            // }, 1000)
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.JLoading = false
+            this.$router.push({
+              path: '/collectionOfRegulatoryOpinions'
+            })
+          } else {
+            this.JLoading = false
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .detail-box {
+    padding: 67px 0 0 0;
+    background: #ffffff;
+    height: 100%;
+    overflow: auto;
+  }
+
+  #examineBox {
+    display: flex;
+    flex-direction: column;
+    background: #fff;
+    position: relative;
+    height: 100%;
+    overflow-y: auto;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 88px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 48px;
+    color: #000F16;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+    margin-bottom: 12px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .formAdd {
+    margin-top: 20px;
+  }
+
+  .button-text {
+    height: 38px;
+    width: calc(100% - 100px);
+    line-height: 38px;
+    background: #fff;
+    border: 1px #00B3BE solid;
+    color: #00B3BE;
+  }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
new file mode 100644
index 000000000..7f8b97246
--- /dev/null
+++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
@@ -0,0 +1,351 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standard')">
+                <span>{{$t('standard')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                       v-model="queryParam.serialNumber"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('title')">
+                <span>{{$t('title')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.title"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text tree-select">
+              <div class="title-text" :title="$t('technicalField')">
+                <span>{{$t('technicalField')}}</span>
+              </div>
+              <a-tree-select
+                tree-node-filter-prop="title"
+                v-model="queryParam.technologyTerritory"
+                :maxTagCount="1"
+                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                class="box-input"
+                style="width: 100%"
+                :tree-data="CategoryTreeList"
+                tree-checkable
+                :placeholder="$t('PleaseSelect')+$t('technicalField')"
+              />
+            </div>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('ProcessStatus')">
+                  <span>{{$t('ProcessStatus')}}</span>
+                </div>
+                <a-select :placeholder="$t('PleaseSelect')+$t('ProcessStatus')"
+                          class="box-input"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          allowClear
+                          v-model="queryParam.gatherResult">
+                  <a-select-option v-for="(item, key) in gatherResultList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+              </div>
+            </a-col>
+          </template>
+          <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">
+                        {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                         <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                 </a>
+               </a-col>
+      </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator">
+      <div @click="initiatingProcessClick" class="operator-text">
+        <a-icon type="apartment"/>
+        {{$t('initiatingProcess')}}
+      </div>
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%'}"
+        rowKey="id"
+        :data-source="dataSource"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :columns="columns"
+      >
+         <span slot="operation" slot-scope="text,record">
+           <a class="text-operation" @click="viewProcessClick(record)">{{$t('viewProcess')}}</a>
+           <a class="text-operation" v-if="record.gatherResult == 'Completed'"
+              @click="evaluationResultsClick(record)">{{$t('evaluationResults')}}</a>
+        </span>
+      </a-table>
+      <div class="page" v-if="dataSource && dataSource.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="pageOnChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+  </a-card>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+
+  export default {
+    name: 'index',
+    data() {
+      return {
+        //url传参严格按照当前命名
+        url: {
+          list: '',
+          getSysCategoryTree: '/sys/category/getSysCategoryTree'
+        },
+        loading: false,
+        toggleSearchStatus: false,
+        dataSource: [],
+        selectedRowKeys: [],
+        total: 0,
+        pageSize: 10,
+        pageNo: 1,
+        CategoryTreeList: [],
+        queryParam: {},
+        gatherResultList: [
+          {
+            value: 'Underway',
+            name: this.$t('inProgress')
+          },
+          {
+            value: 'Completed',
+            name: this.$t('Finished')
+          }
+        ],
+        columns: [
+          {
+            title: this.$t('standard'),
+            align: 'center',
+            dataIndex: 'serialNumber',
+            width: 170
+          },
+          {
+            title: this.$t('title'),
+            align: 'center',
+            dataIndex: 'title',
+            width: 170
+          },
+          {
+            title: this.$t('technicalField'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'technologyTerritory'
+          },
+          {
+            title: this.$t('evaluationMethod'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'evaluationMethod'
+          },
+          {
+            title: this.$t('ProcessStatus'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'ProcessStatus'
+          },
+          {
+            title: this.$t('dateOfInitiation'),
+            align: 'center',
+            ellipsis: true,
+            width: 170,
+            dataIndex: 'startTime'
+          },
+          {
+            title: this.$t('closingDate'),
+            align: 'center',
+            ellipsis: true,
+            width: 170,
+            dataIndex: 'endTime'
+          },
+          {
+            title: this.$t('remarks'),
+            align: 'center',
+            ellipsis: true,
+            width: 170,
+            dataIndex: 'remarks'
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 260,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ]
+      }
+    },
+    mounted() {
+      this.getList()
+      this.getSysCategoryTree()
+    },
+    methods: {
+      getSysCategoryTree() {
+        getAction(this.url.getSysCategoryTree, {}).then((res) => {
+          if (res.success) {
+            this.CategoryTreeList = res.result
+          } else {
+            this.CategoryTreeList = []
+          }
+        })
+      },
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+      },
+      initiatingProcessClick() {
+        let newUrl = this.$router.resolve({
+          path: '/evaluationInitiationProcess'
+        })
+        // let newUrl = this.$router.resolve({
+        //   path: '/regulatoryProcessReview'
+        // })
+        window.open(newUrl.href, '_blank')
+      },
+      viewProcessClick(row) {
+        let newUrl = this.$router.resolve({
+          path: '/processDetails',
+          query: {
+            prcNum: row.prcNum,
+            prcType: 6,
+            prcId: row.actiProcInstId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      evaluationResultsClick(row) {
+        this.$refs.evaluationResultsListRef.getData(JSON.parse(JSON.stringify(row)))
+      }
+    }
+  }
+</script>
+
+<style>
+  .tree-select .ant-select-tree-dropdown {
+    height: 298px !important;
+  }
+</style>
+<style scoped>
+  @import '~@assets/less/common.less';
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .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;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+</style>
\ No newline at end of file

From 66d2c12d3d8edb669131b4847c90bacef5df3d80 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 11 Jul 2022 15:29:51 +0800
Subject: [PATCH 003/103] =?UTF-8?q?=E5=B8=83=E5=B1=80=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

---
 jero-web/src/common/lang/en-us.js             |   5 +
 jero-web/src/common/lang/zh-cn.js             |   5 +
 .../components/TermInformation.vue            |  70 +++++
 .../components/initiatingProcess.vue          | 204 ++++++++++++---
 .../components/standardDecompositionSheet.vue | 247 ++++++++++++++++++
 .../technologyAssessment/index.vue            |  94 ++++++-
 6 files changed, 578 insertions(+), 47 deletions(-)
 create mode 100644 jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
 create mode 100644 jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 2db63ba8e..9b08f22c0 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1107,4 +1107,9 @@ module.exports = {
   ValidationComplianceNotification:'Validation Compliance Notification',
   RegulationTaskConfirmationNotification:'Regulation Task Confirmation Notification',
   evaluationMethod:'Evaluation method',
+  uploadRelevantMaterials:'Upload relevant materials',
+  processBackground:'Process background',
+  selectedStandard:'Selected standard',
+  standardDecompositionDocument:'Standard decomposition document',
+  pleaseSelectStandardFirst:'Please select a standard first',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 82611fe55..d1d642381 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1111,4 +1111,9 @@ module.exports = {
   ValidationComplianceNotification:'验证符合性通知',
   RegulationTaskConfirmationNotification:'任务确认通知',
   evaluationMethod:'评估方式',
+  uploadRelevantMaterials:'相关资料上传',
+  processBackground:'流程背景',
+  selectedStandard:'所选标准',
+  standardDecompositionDocument:'带入标准分解单',
+  pleaseSelectStandardFirst:'请先选择标准',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
new file mode 100644
index 000000000..1ccae18b1
--- /dev/null
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
@@ -0,0 +1,70 @@
+<template>
+  <div class="box" style="margin-bottom: 20px">
+    <a-table
+      :columns="columns"
+      :scroll="{x: '100%'}"
+      :data-source="dataList"
+      :pagination="false"
+      :loading="loading">
+
+    </a-table>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'TermInformation',
+    data() {
+      return {
+        columns: [
+          {
+            title: this.$t('clauseNo'),
+            dataIndex: 'items_num',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseName'),
+            dataIndex: 'items_name',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseContent'),
+            dataIndex: 'iterms_conditions',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('evaluationMethod'),
+            dataIndex: 'evaluationMethod',
+            align: 'center',
+            scopedSlots: { customRender: 'evaluationMethod' }
+          },
+          {
+            title: this.$t('Assessor'),
+            dataIndex: 'Assessor',
+            align: 'center',
+            scopedSlots: { customRender: 'Assessor' }
+          },
+          {
+            title: this.$t('operation'),
+            dataIndex: 'Assessor',
+            align: 'center',
+            width: 100,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        dataList: [],
+        loading: false
+      }
+    },
+    mounted() {
+    },
+    methods: {}
+  }
+</script>
+
+<style scoped>
+
+</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 66b030e9c..1cf238d6c 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -34,6 +34,24 @@
           />
         </div>
         <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+          <a-row :gutter="24" style="margin-bottom: 10px">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('selectedStandard')">{{$t('selectedStandard')}}</span>
+                </div>
+                <div class="title-text-content"
+                     :class="{'title-text-content-one':!isTrue}">
+                  件大事发的科技示范和的空间是否和是科技示范的空间是多少
+                </div>
+                <div class="title-text-right" v-if="isTrue">
+                  <span @click="standardDecompositionDocumentClick">
+                    {{$t('standardDecompositionDocument')}}
+                  </span>
+                </div>
+              </div>
+            </a-col>
+          </a-row>
           <a-row :gutter="24">
             <a-col :span="12">
               <div class="box-title-text">
@@ -52,6 +70,74 @@
                 </a-form-model-item>
               </div>
             </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="accessory_id">
+                  <a-button type="primary" class="button-text"
+                            @click="clickButtonToUpload('accessory_id')">
+                    {{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' ||
+                    formInline.accessory_id == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                    }}
+                  </a-button>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('processBackground')">{{$t('processBackground')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="taskExplain">
+                  <a-textarea :placeholder="$t('pleaseEnter')+$t('processBackground')"
+                              v-model="formInline.taskExplain"
+                              :rows="4"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('remarks')">{{$t('remarks')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="remarks">
+                  <a-textarea :placeholder="$t('pleaseEnter')+$t('remarks')"
+                              v-model="formInline.remarks"
+                              :rows="4"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24" v-if="!isTrue">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('evaluationMethod')">{{$t('evaluationMethod')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="evaluatorIdsName">
+                  <a-select :placeholder="$t('PleaseSelect')+$t('evaluationMethod')"
+                            class="box-input"
+                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                            allowClear
+                            v-model="formInline.gatherResult">
+                    <a-select-option v-for="(item, key) in gatherResultList"
+                                     :key="key"
+                                     :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                    </a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </div>
+            </a-col>
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
@@ -69,38 +155,8 @@
               </div>
             </a-col>
           </a-row>
-          <a-row :gutter="24">
-            <a-col :span="24">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="title-text-text" :title="$t('taskDescription')">{{$t('taskDescription')}}</span>
-                </div>
-                <a-form-model-item class="itemModel" prop="taskExplain">
-                  <a-textarea :placeholder="$t('pleaseEnter')+$t('taskDescription')"
-                              v-model="formInline.taskExplain"
-                              :rows="4"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
-                </div>
-                <a-form-model-item class="itemModel" prop="accessory_id">
-                  <a-button type="primary" class="button-text"
-                            @click="clickButtonToUpload('accessory_id')">
-                    {{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' ||
-                    formInline.accessory_id == null) ? $t('clickUpload') : $t('viewUploadedFiles')
-                    }}
-                  </a-button>
-                </a-form-model-item>
-              </div>
-            </a-col>
-          </a-row>
         </a-form-model>
+        <TermInformation v-if="isTrue"/>
         <footerProcess
           @submit="submit"
           :isSubmit="true"
@@ -109,6 +165,8 @@
     </div>
     <JLoading :loading="JLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
     <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
+    <standardDecompositionSheet ref="standardDecompositionSheetRef"
+                                @standardDecompositionSheetForm="standardDecompositionSheetForm"/>
   </div>
 </template>
 
@@ -118,6 +176,8 @@
   import uploadFile from '@/components/uploadFile/file'
   import PersonnelSelection from '@/components/PersonnelSelection/index'
   import footerProcess from '../../../processCenter/components/footerProcess'
+  import standardDecompositionSheet from './standardDecompositionSheet'
+  import TermInformation from './TermInformation'
   import { getAction, postAction } from '@/api/manage'
   import moment from 'moment'
   import eventBUs from '../../../../common/event'
@@ -130,7 +190,9 @@
       search,
       uploadFile,
       footerProcess,
-      PersonnelSelection
+      PersonnelSelection,
+      standardDecompositionSheet,
+      TermInformation
     },
     data() {
       return {
@@ -141,13 +203,24 @@
           addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy'
         },
         loading: false,
-        JLoading:false,
+        JLoading: false,
+        isTrue: false,
         dataSource: [],
         selectedRowKeys: [],
         total: 0,
         pageSize: 10,
         pageNo: 1,
         formInline: {},
+        gatherResultList: [
+          {
+            value: 'Underway',
+            name: this.$t('inProgress')
+          },
+          {
+            value: 'Completed',
+            name: this.$t('Finished')
+          }
+        ],
         rules: {
           endTime: [
             {
@@ -215,6 +288,11 @@
     mounted() {
       document.title = this.$t('regulatoryEngineer') + this.$t('initiatingProcess')
       this.getList()
+      if (this.$route.query.whetherTobring == '1') {
+        this.isTrue = true
+      } else {
+        this.isTrue = false
+      }
       eventBUs.$on('searchQuery', search => {
         Object.keys(search).forEach(res => {
           if (search[res] instanceof Array) {
@@ -263,6 +341,16 @@
           record.shift()
         }
         this.selectedRowKeysRecord = record
+      },
+      standardDecompositionDocumentClick() {
+        if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length > 0) {
+          this.$refs.standardDecompositionSheetRef.getData(JSON.parse(JSON.stringify(this.selectedRowKeysRecord[0])))
+        } else {
+          this.$message.warning(this.$t('pleaseSelectStandardFirst'))
+        }
+      },
+      standardDecompositionSheetForm(value) {
+
       },
       clickButtonToUpload(item) {
         this.$refs.uploadFile.perentHandleFunc()
@@ -295,14 +383,14 @@
       dateChange(item) {
         this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : ''
       },
-      getUUID(){
-        var str=[];
-        var Chars='0123456789abcdefghijklmnopqrstuvwxyz';
-        for(var i=0;i<36;i++){
-          str[i]=Chars.substr(Math.floor(Math.random()*16),1)
+      getUUID() {
+        var str = []
+        var Chars = '0123456789abcdefghijklmnopqrstuvwxyz'
+        for (var i = 0; i < 36; i++) {
+          str[i] = Chars.substr(Math.floor(Math.random() * 16), 1)
         }
-        str[0]=str[8]=str[13]=str[18]=str[23]='-';
-        return str.join("")
+        str[0] = str[8] = str[13] = str[18] = str[23] = '-'
+        return str.join('')
       },
       submit() {
         this.$refs.ruleForm.validate(valid => {
@@ -336,7 +424,7 @@
         postAction('/workFlow/startProcess', query).then((res) => {
           if (res.success) {
             this.completeTask(value, res.result)
-          }else{
+          } else {
             this.JLoading = false
           }
         })
@@ -444,4 +532,38 @@
     text-align: right;
     margin-top: 20px;
   }
+
+  .title-text-content {
+    display: inline-block;
+    width: calc(100% - 334px);
+    text-align: center;
+    border: 1px solid #d9d9d9;
+    line-height: 38px;
+    border-bottom-left-radius: 5px;
+    border-top-left-radius: 5px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .title-text-right {
+    width: 200px;
+    text-align: center;
+    border: 1px solid #d9d9d9;
+    line-height: 38px;
+    border-bottom-right-radius: 5px;
+    border-top-right-radius: 5px;
+    border-left: none;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    color: #21c9cc;
+    cursor: pointer;
+  }
+
+  .title-text-content-one {
+    border-bottom-right-radius: 5px;
+    border-top-right-radius: 5px;
+    width: calc(100% - 128px);
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue
new file mode 100644
index 000000000..511c36717
--- /dev/null
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue
@@ -0,0 +1,247 @@
+<template>
+  <a-drawer
+    :title="$t('StandardBreakdown')"
+    :maskClosable="false"
+    :width="1000"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :md="12" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('standard')">
+                  <span>{{$t('standard')}}</span>
+                </div>
+                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                         v-model="queryParam.serial_number"></a-input>
+              </div>
+            </a-col>
+            <span style="float: right;overflow: hidden;margin-top: 4px" class="table-page-search-submitButtons">
+               <a-col :md="12" :sm="24">
+                   <div @click="handleModule" class="operator-text">
+                       <a-icon type="download"/>
+                      {{$t('templateDownload')}}
+                    </div>
+                    <div class="operator-text">
+                      <ImportFile :url="url" :projectId="$route.query.id" :isTrue="true" :accept="'.xls'"
+                                  @getList="getPersonnelList"/>
+                     </div>
+                    </a-col>
+            </span>
+          </a-row>
+        </a-form>
+      </div>
+      <a-table
+        :columns="columns"
+        rowKey="id"
+        :scroll="{x: 1200}"
+        :data-source="dataList"
+        :pagination="false"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :loading="loading">
+
+      </a-table>
+      <div class="page" v-if="dataList.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+`${total}`+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="onChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" type="danger" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import ImportFile from '@/components/ImportFile/index'
+
+  export default {
+    name: 'standardDecompositionSheet',
+    components: {
+      ImportFile
+    },
+    data() {
+      return {
+        visible: false,
+        queryParam: {},
+        confirmLoading: false,
+        selectedRowKeys: [],
+        url: {
+          list: '/split/sarFileSplitItems/getSplitItemsByPage'
+        },
+        columns: [
+          {
+            title: this.$t('clauseNo'),
+            dataIndex: 'items_num',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseName'),
+            dataIndex: 'items_name',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseContent'),
+            dataIndex: 'iterms_conditions',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('technicalField'),
+            dataIndex: 'technology_territory',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('informationCategory'),
+            dataIndex: 'information_category',
+            align: 'center',
+            ellipsis: true
+          }
+        ],
+        dataList: [],
+        content: [],
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        total: 0,
+        standData: {},
+        fieldList: [],
+        queryConditionVOList: []
+      }
+    },
+    methods: {
+      handleModule() {
+
+      },
+      getData(row) {
+        this.standData = row
+        this.visible = true
+        this.replacePage()
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.replacePage()
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.replacePage()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.replacePage()
+      },
+      getPersonnelList() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      replacePage() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          info_id: this.standData.id,
+          menu_id:'',
+          ...this.queryParam
+        }
+        this.loading = true
+        postAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataList = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.dataList = []
+            this.total = 0
+            this.loading = false
+          }
+        })
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      handleSubmit() {
+
+      },
+      onSelectChange() {
+
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  @import '~@assets/less/common.less';
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    z-index: 100;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 33px;
+    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: 100%;
+    height: 38px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
index 7f8b97246..ca3a8db38 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
@@ -111,6 +111,43 @@
         />
       </div>
     </div>
+    <a-modal
+      :title="$t('initiatingProcess')"
+      :width="600"
+      :visible="visible"
+      :maskClosable="false"
+      @ok="handleOk"
+      @cancel="visible = false"
+    >
+      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text" style="margin-top: -18px">
+                <span class="Required">*</span>
+                <span class="title-text-text"
+                      :title="$t('standardDecompositionDocument')">{{$t('standardDecompositionDocument')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="whetherTobring">
+                <a-select :placeholder="$t('PleaseSelect')+$t('standardDecompositionDocument')"
+                          class="box-input"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          allowClear
+                          v-model="formInline.whetherTobring">
+                  <a-select-option v-for="(item, key) in whetherTobringList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-modal>
   </a-card>
 </template>
 
@@ -126,6 +163,7 @@
           list: '',
           getSysCategoryTree: '/sys/category/getSysCategoryTree'
         },
+        visible: false,
         loading: false,
         toggleSearchStatus: false,
         dataSource: [],
@@ -135,6 +173,26 @@
         pageNo: 1,
         CategoryTreeList: [],
         queryParam: {},
+        formInline: {},
+        rules: {
+          whetherTobring: [
+            {
+              required: true,
+              message: this.$t('standardDecompositionDocument') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ]
+        },
+        whetherTobringList: [
+          {
+            value: '1',
+            name: '是'
+          },
+          {
+            value: '2',
+            name: '否'
+          }
+        ],
         gatherResultList: [
           {
             value: 'Underway',
@@ -271,14 +329,27 @@
       onSelectChange(value) {
         this.selectedRowKeys = value
       },
+      handleOk() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            this.visible = false
+            let newUrl = this.$router.resolve({
+              path: '/evaluationInitiationProcess',
+              query: this.formInline
+            })
+            // let newUrl = this.$router.resolve({
+            //   path: '/regulatoryProcessReview'
+            // })
+            window.open(newUrl.href, '_blank')
+          }
+        })
+      },
       initiatingProcessClick() {
-        let newUrl = this.$router.resolve({
-          path: '/evaluationInitiationProcess'
+        this.visible = true
+        this.formInline = {}
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
         })
-        // let newUrl = this.$router.resolve({
-        //   path: '/regulatoryProcessReview'
-        // })
-        window.open(newUrl.href, '_blank')
       },
       viewProcessClick(row) {
         let newUrl = this.$router.resolve({
@@ -348,4 +419,15 @@
   .text-operation {
     margin-right: 8px;
   }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
 </style>
\ No newline at end of file

From bf4bd9e8d46c42cbbe25f68f4059ef02a76ddcb0 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 11 Jul 2022 16:44:33 +0800
Subject: [PATCH 004/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?=
 =?UTF-8?q?=E7=9A=84=E4=B8=8A=E7=A7=BB=E4=B8=8B=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...onthlyReportTitleTemplateEOController.java | 14 ++++-
 .../components/modules/fillTable.vue          | 54 ++++++++++++++++---
 2 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java
index db6a7d163..4ccc7a42f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java
@@ -1,5 +1,7 @@
 package com.jero.modules.report.controller;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
@@ -23,6 +25,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -186,13 +189,20 @@ public class LawsMonthlyReportTitleTemplateEOController extends JeroController<L
 
 	 /**
 	  * 上移下移
-	  * @param lawsMonthlyReportTitleTemplateEOS
+	  * @param jsonObject
 	  * @return
 	  */
 	 @AutoLog(value = "上移下移")
 	 @ApiOperation(value="上移下移", notes="上移下移")
 	 @PostMapping(value = "/move")
-	 public Result<?> move(@RequestBody List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS) {
+	 public Result<?> move(@RequestBody JSONObject jsonObject) {
+		 JSONArray lawsMonthlyReportTitleTemplateJson = jsonObject.getJSONArray("lawsMonthlyReportTitleTemplateEOS");
+		 LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO = null;
+		 List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS = new ArrayList<>();
+		 for (Object o : lawsMonthlyReportTitleTemplateJson) {
+			 lawsMonthlyReportTitleTemplateEO=JSONObject.parseObject(JSONObject.toJSONString(o),LawsMonthlyReportTitleTemplateEO.class);
+			 lawsMonthlyReportTitleTemplateEOS.add(lawsMonthlyReportTitleTemplateEO);
+		 }
 		 lawsMonthlyReportTitleTemplateEOService.move(lawsMonthlyReportTitleTemplateEOS);
 		 return Result.OK("操作成功！");
 	 }
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
index f738e0f96..7d2abf4fb 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
@@ -28,9 +28,9 @@
         :data-source="dataSource"
         :columns="columns"
       >
-        <span slot="operation" slot-scope="text,record">
-           <a class="text-operation" @click="moveUpClick(record)">{{$t('moveUp')}}</a>
-           <a class="text-operation" @click="moveDownClick(record)">{{$t('moveDown')}}</a>
+        <span slot="operation" slot-scope="text,record,index">
+           <a class="text-operation" @click="moveUpClick(record,index)">{{$t('moveUp')}}</a>
+           <a class="text-operation" @click="moveDownClick(record,index)">{{$t('moveDown')}}</a>
            <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
            <a class="text-operation" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
         </span>
@@ -69,6 +69,7 @@
         dataSource: [],
         pageNo: 1,
         pageSize: 10,
+        sortList: [],
         total: 0,
         columns: [
           {
@@ -146,11 +147,49 @@
           }
         })
       },
-      moveUpClick() {
-
+      moveUpClick(row, index) {
+        this.sortList = []
+        this.sortList.push(row)
+        if (row.parentId) {
+          let content = this.dataSource.filter(res => {
+            return row.parentId == res.id
+          })
+          if (index != 0) {
+            this.sortList.push(content[0].children[index - 1])
+          }
+        } else {
+          if (index != 0) {
+            this.sortList.push(this.dataSource[index - 1])
+          }
+        }
+        this.move()
       },
-      moveDownClick() {
-
+      moveDownClick(row, index) {
+        this.sortList = []
+        this.sortList.push(row)
+        if (row.parentId) {
+          let content = this.dataSource.filter(res => {
+            return row.parentId == res.id
+          })
+          if (index != (content[0].children.length - 1)) {
+            this.sortList.push(content[0].children[index + 1])
+          }
+        } else {
+          if (index != (this.dataSource.length - 1)) {
+            this.sortList.push(this.dataSource[index + 1])
+          }
+        }
+        this.move()
+      },
+      move() {
+        postAction('/report/lawsMonthlyReportTitleTemplateEO/move', { lawsMonthlyReportTitleTemplateEOS: this.sortList }).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.getList()
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
       },
       deleteLib(val) {
         let _this = this
@@ -185,6 +224,7 @@
     text-align: right;
     margin-bottom: 16px;
   }
+
   .text-operation {
     margin-right: 8px;
   }

From a4ef7232f314ed4d93528642cbaf9a7f77f51a70 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 11 Jul 2022 17:22:08 +0800
Subject: [PATCH 005/103] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=9C=88=E6=8A=A5=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../regulationReport/components/modules/addModel.vue            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue
index 8e792dd8a..b5543536a 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue
@@ -207,7 +207,7 @@
           queryConditionVOList: JSON.stringify(queryConditionVOList)
         }
         this.loading = true
-        postAction('/dummy/dummyInventoryInfoEO/queryPageDummy', query).then((res) => {
+        postAction('/report/lawsMonthlyReportWriteEO/queryPageDocument', query).then((res) => {
           if (res.success) {
             this.dataList = res.result.records || []
             this.total = res.result.total

From e6270bf4f864b2247254f129a8531deafa12c308 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 11 Jul 2022 17:30:48 +0800
Subject: [PATCH 006/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99--=E5=B8=A6=E5=85=A5=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsMonthlyReportWriteEOController.java   | 15 ++-
 .../ILawsMonthlyReportWriteEOService.java     |  3 +
 .../LawsMonthlyReportWriteEOServiceImpl.java  | 91 ++++++++++++++++++-
 3 files changed, 105 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java
index 8c873e5d6..9f965309c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportWriteEOController.java
@@ -9,6 +9,7 @@ import com.jero.modules.report.service.ILawsMonthlyReportWriteEOService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
@@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -27,9 +29,10 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 
- /**
+/**
  * @Description: 月报填写
  * @Author: jero-boot
  * @Date:   2022-07-02
@@ -184,4 +187,14 @@ public class LawsMonthlyReportWriteEOController extends JeroController<LawsMonth
 		 return lawsMonthlyReportWriteEOService.exportMonthlyReport(lawsMonthlyReportWriteEO);
 	 }
 
+	@ApiOperation(value="带入标准信息--分页", notes="带入标准信息--分页")
+	@PostMapping(value = "/queryPageDocument")
+	@ResponseBody
+	public JSONObject queryPageDocument(@RequestBody Map<String,Object> parameter) {
+		IPage infoPage = lawsMonthlyReportWriteEOService.queryPageDocument(parameter);
+		Result<IPage> ok = Result.OK(infoPage);
+		JSONObject jsonResult = JSONObject.fromObject(ok);
+		return jsonResult;
+	}
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java
index 503feabb0..9f4e58fec 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportWriteEOService.java
@@ -7,6 +7,7 @@ import org.springframework.http.ResponseEntity;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 月报填写
@@ -77,4 +78,6 @@ public interface ILawsMonthlyReportWriteEOService extends IService<LawsMonthlyRe
 												HttpServletRequest req);
 
 	ResponseEntity<byte[]> exportMonthlyReport(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO);
+
+	IPage queryPageDocument(Map<String, Object> parameter);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
index 60deb8c14..1739939b6 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
@@ -6,7 +6,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.constant.enums.ModuleEnum;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
+import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
+import com.jero.modules.document.enums.FieldTypeEnum;
+import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper;
+import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl;
 import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO;
 import com.jero.modules.report.entity.LawsMonthlyReportWriteEO;
 import com.jero.modules.report.entity.NewOpinionTemplateEO;
@@ -20,7 +26,9 @@ import com.jero.modules.report.service.INewOpinionTemplateEOService;
 import com.jero.modules.report.service.INewStandardTemplateEOService;
 import com.jero.modules.report.util.WordUtil;
 import com.jero.modules.system.entity.SysCategory;
+import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
+import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import com.jero.modules.system.util.StringUtils;
 import org.apache.poi.xwpf.usermodel.ParagraphAlignment;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
@@ -37,6 +45,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -58,6 +67,14 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 	private SysCategoryServiceImpl sysCategoryService;
 	@Value(value = "${jero.path.upload}")
 	private String uploadpath;
+	@Autowired
+	private OnlCgformFieldServiceImpl onlCgformFieldService;
+	@Autowired
+	private BussDocumentLibraryEOServiceImpl bussDocumentLibraryEOService;
+	@Autowired
+	private BussDocumentLibraryEOMapper bussDocumentLibraryEOMapper;
+	@Autowired
+	private SysDictItemServiceImpl sysDictItemServiceImpl;
 	/**
 	 * 保存
 	 *
@@ -344,6 +361,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 		return null;
 	}
 
+
 	/**
 	 *
 	 * @param path
@@ -377,8 +395,75 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 		} catch (IOException e) {
 			log.error("文件创建异常,异常信息为：" + e.getMessage());
 		}
-
-
-
 	}
+
+	@Override
+	public IPage queryPageDocument(Map<String, Object> parameter) {
+		String cut = (String) parameter.get("cut");//中英文切换标识
+		//文档库字段
+		List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
+		//需要查询的字段
+		List<String> fieldListQuery = new ArrayList<>();
+		fieldListQuery.add("serial_number");
+		fieldListQuery.add("title");
+		fieldListQuery.add("title_en");
+		fieldListQuery.add("state");
+		fieldListQuery.add("region");
+		fieldListQuery.add("technology_territory");
+		fieldListQuery.add("xin1_che1_xing2_shi2_shi1_ri4_qi1");
+		fieldListQuery.add("implement_time");
+		fieldListQuery.add("corresponding_standard");
+		fieldListQuery.add("shi4_yong4_che1_xing2");
+		fieldListQuery.add("shi4_yong4_fan4_wei2");
+
+		List<String> fieldListNew = new ArrayList<>();
+		fieldListNew.add("id");
+
+		//转时间格式
+		for (String field : fieldListQuery) {
+			String fieldTemp = null;
+			if ("xin1_che1_xing2_shi2_shi1_ri4_qi1".equals(field) || "implement_time".equals(field)) {
+				String fieldNew = "date_format(" + field + ", '%Y-%m-%d')";
+				fieldTemp = "case when " + fieldNew + " is null then \"\" else " + fieldNew + " end " + field;
+				fieldListNew.add(fieldTemp);
+			} else {
+				fieldTemp = "case when " + field + " is null then \"\" else " + field + " end " + field;
+				fieldListNew.add(fieldTemp);
+			}
+		}
+		//封装查询条件
+		String condition = bussDocumentLibraryEOService.getConditionStr(parameter);
+		int pageNo = Integer.parseInt(parameter.get("pageNo").toString());
+		int pageSize = Integer.parseInt(parameter.get("pageSize").toString());
+		IPage page = new Page(pageNo, pageSize);
+
+		IPage infoPage = bussDocumentLibraryEOMapper.getInfoPage(page, " " + StringUtils.join(fieldListNew, ","), condition);
+
+		//树形数据字典
+		List<SysCategory> categoryList = sysCategoryService.list();
+		//过滤出树形字段
+		List<OnlCgformField> treeFieldList = fieldList.stream()
+				.filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType()))
+				.collect(Collectors.toList());
+
+
+		List<Map> records = infoPage.getRecords();
+		//数据字典
+		List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll();
+		//下拉选处理数据字典
+		for (Map record : records) {
+			Map<String, Object> record1 = (Map) record;
+			record1.put("state_dict",record1.get("state"));//状态
+			record1.put("technology_territory_dict",record1.get("technology_territory"));//相关领域
+			record1.put("shi4_yong4_fan4_wei2_dict",record1.get("shi4_yong4_fan4_wei2"));//适用范围
+			record1.put("shi4_yong4_che1_xing2_dict",record1.get("shi4_yong4_che1_xing2"));//适用车型
+			for (Map.Entry<String, Object> entry : record1.entrySet()) {
+				//下拉选处理数据字典
+				bussDocumentLibraryEOService.dictItem(sysDictItems, entry, cut, fieldList,null);
+				bussDocumentLibraryEOService.treeDictItem(categoryList, entry, treeFieldList, cut,null);
+			}
+		}
+		return infoPage;
+	}
+
 }

From 348ef3667682aefca19e4b0fee174139db0686a4 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 11 Jul 2022 17:41:56 +0800
Subject: [PATCH 007/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/layouts/TabLayout.vue |   1 +
 jero-web/src/config/router.config.js          |   5 +
 .../technologyAssessment/index.vue            |  10 +-
 .../processForm/evaluationProcess/index.vue   | 209 ++++++++++++++++++
 4 files changed, 220 insertions(+), 5 deletions(-)
 create mode 100644 jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue

diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue
index 63efafd77..d2b7479b0 100644
--- a/jero-web/src/components/layouts/TabLayout.vue
+++ b/jero-web/src/components/layouts/TabLayout.vue
@@ -97,6 +97,7 @@
           this.$route.path == '/handshakeProcess' ||
           this.$route.path == '/projectStatusAndProgress' ||
           this.$route.path == '/TaskPlanList' ||
+          this.$route.path == '/evaluationProcess' ||
           this.$route.path == '/evaluationInitiationProcess' ||
           this.$route.path == '/historicalVersion' ||
           this.$route.path == '/dashboard/analysis' ||
diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js
index 6c5c7f1d2..b544ebd0b 100644
--- a/jero-web/src/config/router.config.js
+++ b/jero-web/src/config/router.config.js
@@ -367,6 +367,11 @@ export const constantRouterMap = [
     name: 'taskListProcess',
     component: () => import(/* webpackChunkName: "user" */ '@/views/processCenter/processForm/taskListProcess/index')
   },
+  {
+    path: '/evaluationProcess',
+    name: 'evaluationProcess',
+    component: () => import(/* webpackChunkName: "user" */ '@/views/processCenter/processForm/evaluationProcess/index')
+  },
   {
     path: '/handshakeProcess',
     name: 'handshakeProcess',
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
index ca3a8db38..52090af72 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
@@ -333,13 +333,13 @@
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
             this.visible = false
-            let newUrl = this.$router.resolve({
-              path: '/evaluationInitiationProcess',
-              query: this.formInline
-            })
             // let newUrl = this.$router.resolve({
-            //   path: '/regulatoryProcessReview'
+            //   path: '/evaluationInitiationProcess',
+            //   query: this.formInline
             // })
+            let newUrl = this.$router.resolve({
+              path: '/evaluationProcess'
+            })
             window.open(newUrl.href, '_blank')
           }
         })
diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
new file mode 100644
index 000000000..94ec268cf
--- /dev/null
+++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
@@ -0,0 +1,209 @@
+<template>
+  <div id="examineBox">
+    <headerProcess
+      :title="title"
+    />
+    <div class="detail-box">
+      <div class="detail-content" style="padding: 10px 0 0 0">
+        <standardContent
+          v-if="isDisplay"
+          :title="$t('essentialInformation')"
+          :standardContentList="standardContentList"
+          :url="url"
+          :standardContentQuery="queryProject"
+        />
+        <feedbackInformation
+          v-if="isDisplay"
+          ref="feedbackInformationRef"
+          :feedbackDataList="feedbackDataList"
+          :title="$t('feedbackInformation')"
+        />
+        <footerProcess
+          v-if="isDisplay"
+          isPreservation
+          :isSubmit="true"
+          @preservation="preservation"
+          @submit="submit"
+        />
+        <circulationHistory v-if="isDisplay"/>
+      </div>
+    </div>
+    <JLoading :loading="loading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
+  </div>
+</template>
+
+<script>
+  import headerProcess from '../../components/headerProcess'
+  import standardContent from '../../components/standardContent'
+  import circulationHistory from '../../components/regulatoryCirculationHistory'
+  import footerProcess from '../../components/footerProcess'
+  import feedbackInformation from '../../components/feedbackInformation'
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+  import moment from 'moment'
+  import { mapGetters } from 'vuex'
+  export default {
+    name: 'evaluationProcess',
+    components: {
+      headerProcess,
+      standardContent,
+      circulationHistory,
+      footerProcess,
+      feedbackInformation
+    },
+    data() {
+
+      return {
+        title: this.$t('collectionOfRegulatoryOpinions'),
+        url: {
+          queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds',
+          list: '/lawsOpinionGather/lawsOpinionAssessmentResultEO/list'
+        },
+        loading: false,
+        isDisplay: true,
+        feedbackDataList: [],
+        queryProject: {},
+        standardContentList: [
+          {
+            title: this.$t('standard'),
+            value: 'serial_number'
+          },
+          {
+            title: this.$t('title'),
+            value: 'title'
+          },
+          {
+            title: this.$t('regulatoryEngineer'),
+            value: 'currentUserName'
+          },
+          {
+            title: this.$t('closingDate'),
+            value: 'endTime'
+          },
+          {
+            title: this.$t('enclosure'),
+            value: 'accessory_id',
+            type: 2
+          },
+          {},
+          {
+            title: this.$t('taskDescription'),
+            value: 'taskExplain'
+          }
+          // {
+          //   title: this.$t('remarks'),
+          //   value: 'remark'
+          // }
+        ]
+      }
+    },
+    mounted() {
+      this.isDisplay = false
+      this.queryTaskDetailByTask(() => {
+        this.lawsOpinionAssessmentResult()
+      })
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      queryTaskDetailByTask(callback) {
+        this.loading = true
+        getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => {
+          if (res instanceof String) {
+            this.queryProject = JSON.parse(res) || {}
+            callback && callback()
+          } else {
+            this.queryProject = res || {}
+            callback && callback()
+          }
+        })
+      },
+      lawsOpinionAssessmentResult() {
+        getAction(this.url.list, {
+          lawsOpinionGatherId: this.queryProject.id,
+          actiProcInstId: this.$route.query.prcId
+        }).then((res) => {
+          if (res.success) {
+            this.feedbackDataList = res.result || []
+            this.loading = false
+          } else {
+            this.feedbackDataList = []
+            this.loading = false
+          }
+          this.isDisplay = true
+        })
+      },
+      preservation() {
+        this.loading = true
+        let dataList = this.$refs.feedbackInformationRef.dataList
+        this.insertBatch(dataList, 1)
+      },
+      insertBatch(list, num) {
+        list.forEach(res => {
+          res.lawsOpinionGatherId = this.queryProject.id
+          res.actiProcInstId = this.$route.query.prcId
+        })
+        postAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/insertBatch', { dataList:list }).then((res) => {
+          if (res.success) {
+            if (num == 1) {
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.$router.push({
+                path: '/collectionOfRegulatoryOpinions'
+              })
+              this.loading = false
+            } else {
+              this.completeTask()
+            }
+          } else {
+            if (num == 1) {
+              this.loading = false
+              this.$message.warning(this.$t('operationFailed'))
+            }
+          }
+        })
+      },
+      submit() {
+        let dataList = this.$refs.feedbackInformationRef.dataList
+        this.insertBatch(dataList, 2)
+      },
+      completeTask() {
+        let query = {
+          userid: this.userInfo().id,
+          taskId: this.$route.query.taskIds,
+          json: JSON.stringify(this.queryProject).replace(/\"/g, '\'')
+        }
+        postAction('/workFlow/completeTask', query).then((res) => {
+          if (res.success) {
+            // setTimeout(() => {
+            //   window.close()
+            // }, 1000)
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.loading = false
+            this.$router.push({
+              path: '/collectionOfRegulatoryOpinions'
+            })
+          } else {
+            this.loading = false
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .detail-box {
+    padding: 67px 0 0 0;
+    background: #ffffff;
+    height: 100%;
+    overflow: auto;
+  }
+
+  #examineBox {
+    display: flex;
+    flex-direction: column;
+    background: #fff;
+    position: relative;
+    height: 100%;
+    overflow-y: auto;
+  }
+</style>
\ No newline at end of file

From fd165ded018285f10a954281a96481e0c3c51a88 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 11 Jul 2022 17:46:20 +0800
Subject: [PATCH 008/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=BC=80=E5=8F=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql |  27 +++
 .../com/jero/config/shiro/ShiroConfig.java    |   4 +
 .../LawsTechnologyEvaluationEOController.java |  16 +-
 ...ologyEvaluationFlowDetailEOController.java | 184 ++++++++++++++++++
 .../LawsTechnologyEvaluationFlowDetailEO.java |  89 +++++++++
 .../enums/EvaluationTypeEnum.java             |  51 +++++
 ...echnologyEvaluationFlowDetailEOMapper.java |  17 ++
 ...TechnologyEvaluationFlowDetailEOMapper.xml |  17 ++
 .../ILawsTechnologyEvaluationEOService.java   |   9 +
 ...chnologyEvaluationFlowDetailEOService.java |  70 +++++++
 ...LawsTechnologyEvaluationEOServiceImpl.java |  33 ++++
 ...logyEvaluationFlowDetailEOServiceImpl.java | 129 ++++++++++++
 .../wkflow/controller/workFlowController.java |  11 ++
 .../wkflow/entity/TaskCommonQuery.java        |   4 +-
 .../modules/wkflow/enums/FlowTypeEnum.java    |   1 +
 .../feginClient/WorkFlowFeignClient.java      |   8 +
 .../impl/WorkFlowFeignClientImpl.java         |  10 +
 17 files changed, 678 insertions(+), 2 deletions(-)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationFlowDetailEO.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/EvaluationTypeEnum.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationFlowDetailEOService.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 5af2789e3..12b54b750 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -238,3 +238,30 @@ CREATE TABLE `laws_technology_evaluation`  (
    `prc_num` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程编号',
    PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估表' ROW_FORMAT = DYNAMIC;
+
+--  法规技术评估-流程明细表
+CREATE TABLE `laws_technology_evaluation_flow_detail`  (
+   `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+   `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+   `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
+   `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+   `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
+   `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+   `laws_technology_evaluation_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规技术评估表id',
+   `acti_proc_inst_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例id',
+   `prc_num` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程编号',
+   `prc_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程名称',
+   `evaluator_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '评估人id',
+   PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估-流程明细表' ROW_FORMAT = Dynamic;
+
+-- 工作流数据库增加数据。
+INSERT INTO `t_form` (
+    `OBJECT_ID`,`CODE`,`CREATE_TIME`,`WIDGET_JSON`,`JSON`,`NAME`,`SHOW_KEY`,`IS_DELETED`,
+    `MODEL_ID`,`JSON_EVAL`,`HTML`,`RUN_TYPE`,`CATEGORY_ID`,`HTML_READONLY`
+)
+VALUES
+(
+    'fgjspglc','0006','2022-07-11 15:45:33',NULL,NULL,'法规技术评估流程',NULL,
+    0,'15007',NULL,NULL,'json','4bdf0b396b4aa6ea10dd5e19956a1e22',NULL
+);
diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
index c68350d46..d09b3c92b 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
@@ -145,6 +145,10 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/wkflow/processHistoryEO/processCall", "anon"); // 流程历史 工作流处理数据接口排除
         filterChainDefinitionMap.put("/lawsOpinionGather/lawsOpinionGatherEO/processCall", "anon"); // 法规收集表 工作流处理数据接口排除
         filterChainDefinitionMap.put("/lawsOpinionGather/lawsProcessHistoryEO/processCall", "anon"); // 法规收集历史 工作流处理数据接口排除
+        // 法规技术评估表-流程明细 工作流处理数据接口排除
+        filterChainDefinitionMap.put("/lawsTechnologyEvaluation/lawsTechnologyEvaluationFlowDetailEO/processCall", "anon");
+        // 法规技术评估表 工作流处理数据接口排除
+        filterChainDefinitionMap.put("/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/processCall", "anon");
         filterChainDefinitionMap.put("/sys/user/querySysUserListByIdList", "anon"); // 工作流根据用户idList获取用户信息接口
 
         // 添加自己的过滤器并且取名为jwt
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
index 2c8380afc..f62943826 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
@@ -4,6 +4,8 @@ import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSONObject;
 import com.jero.common.api.vo.Result;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO;
@@ -35,7 +37,7 @@ import com.jero.common.aspect.annotation.AutoLog;
 public class LawsTechnologyEvaluationEOController extends JeroController<LawsTechnologyEvaluationEO, ILawsTechnologyEvaluationEOService> {
 	@Autowired
 	private ILawsTechnologyEvaluationEOService lawsTechnologyEvaluationEOService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -167,4 +169,16 @@ public class LawsTechnologyEvaluationEOController extends JeroController<LawsTec
         return super.importExcel(request, response, LawsTechnologyEvaluationEO.class);
     }
 
+	 /**
+	  * 流程调用接口
+	  * @param jsonObject
+	  * @return
+	  */
+	 @AutoLog(value = "法规意见收集表-流程调用")
+	 @ApiOperation(value="法规意见收集表-流程调用", notes="法规意见收集细表-流程调用")
+	 @PostMapping(value = "/processCall")
+	 public Result<?> processCall(@RequestBody JSONObject jsonObject){
+		 return this.lawsTechnologyEvaluationEOService.processCall(jsonObject);
+	 }
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java
new file mode 100644
index 000000000..38fa76c5a
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java
@@ -0,0 +1,184 @@
+package com.jero.modules.lawsTechnologyEvaluation.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSONObject;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
+import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationFlowDetailEOService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: 法规技术评估表-流程明细
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+@Api(tags="法规技术评估表-流程明细")
+@RestController
+@RequestMapping("/lawsTechnologyEvaluation/lawsTechnologyEvaluationFlowDetailEO")
+@Slf4j
+public class LawsTechnologyEvaluationFlowDetailEOController extends JeroController<LawsTechnologyEvaluationFlowDetailEO, ILawsTechnologyEvaluationFlowDetailEOService> {
+	@Autowired
+	private ILawsTechnologyEvaluationFlowDetailEOService lawsTechnologyEvaluationFlowDetailEOService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param lawsTechnologyEvaluationFlowDetailEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估表-流程明细-分页列表查询")
+	@ApiOperation(value="法规技术评估表-流程明细-分页列表查询", notes="法规技术评估表-流程明细-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<LawsTechnologyEvaluationFlowDetailEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationFlowDetailEO, req.getParameterMap());
+		Page<LawsTechnologyEvaluationFlowDetailEO> page = new Page<LawsTechnologyEvaluationFlowDetailEO>(pageNo, pageSize);
+		IPage<LawsTechnologyEvaluationFlowDetailEO> pageList = lawsTechnologyEvaluationFlowDetailEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估表-流程明细-列表查询")
+    @ApiOperation(value="法规技术评估表-流程明细-列表查询", notes="法规技术评估表-流程明细-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<LawsTechnologyEvaluationFlowDetailEO>> queryList() {
+        List<LawsTechnologyEvaluationFlowDetailEO> list = lawsTechnologyEvaluationFlowDetailEOService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param lawsTechnologyEvaluationFlowDetailEO
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估表-流程明细-添加")
+	@ApiOperation(value="法规技术评估表-流程明细-添加", notes="法规技术评估表-流程明细-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO) {
+		lawsTechnologyEvaluationFlowDetailEOService.add(lawsTechnologyEvaluationFlowDetailEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param lawsTechnologyEvaluationFlowDetailEO
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估表-流程明细-编辑")
+	@ApiOperation(value="法规技术评估表-流程明细-编辑", notes="法规技术评估表-流程明细-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO) {
+		lawsTechnologyEvaluationFlowDetailEOService.editById(lawsTechnologyEvaluationFlowDetailEO);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估表-流程明细-通过id删除")
+	@ApiOperation(value="法规技术评估表-流程明细-通过id删除", notes="法规技术评估表-流程明细-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		lawsTechnologyEvaluationFlowDetailEOService.deleteById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估表-流程明细-批量删除")
+	@ApiOperation(value="法规技术评估表-流程明细-批量删除", notes="法规技术评估表-流程明细-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.lawsTechnologyEvaluationFlowDetailEOService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估表-流程明细-通过id查询")
+	@ApiOperation(value="法规技术评估表-流程明细-通过id查询", notes="法规技术评估表-流程明细-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO = lawsTechnologyEvaluationFlowDetailEOService.queryById(id);
+		if(lawsTechnologyEvaluationFlowDetailEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(lawsTechnologyEvaluationFlowDetailEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param lawsTechnologyEvaluationFlowDetailEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO) {
+        return super.exportXls(request, lawsTechnologyEvaluationFlowDetailEO, LawsTechnologyEvaluationFlowDetailEO.class, "法规技术评估表-流程明细");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, LawsTechnologyEvaluationFlowDetailEO.class);
+    }
+
+	 /**
+	  * 流程调用接口
+	  * @param jsonObject
+	  * @return
+	  */
+	 @AutoLog(value = "法规意见收集-流程明细表-流程调用")
+	 @ApiOperation(value="法规意见收集-流程明细表-流程调用", notes="法规意见收集-流程明细表-流程调用")
+	 @PostMapping(value = "/processCall")
+	 public Result<?> processCall(@RequestBody JSONObject jsonObject){
+		 return this.lawsTechnologyEvaluationFlowDetailEOService.processCall(jsonObject);
+	 }
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationFlowDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationFlowDetailEO.java
new file mode 100644
index 000000000..8178c3dfb
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationFlowDetailEO.java
@@ -0,0 +1,89 @@
+package com.jero.modules.lawsTechnologyEvaluation.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 法规技术评估表-流程明细
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+@Data
+@TableName("laws_technology_evaluation_flow_detail")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="laws_technology_evaluation_flow_detail对象", description="法规技术评估表-流程明细")
+public class LawsTechnologyEvaluationFlowDetailEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+
+	/**法规技术评估表id*/
+	@Excel(name = "法规技术评估表id", width = 15)
+    @ApiModelProperty(value = "法规技术评估表id")
+    private java.lang.String lawsTechnologyEvaluationId;
+
+	/**流程实例id*/
+	@Excel(name = "流程实例id", width = 15)
+    @ApiModelProperty(value = "流程实例id")
+    private java.lang.String actiProcInstId;
+
+	/**流程编号*/
+	@Excel(name = "流程编号", width = 15)
+    @ApiModelProperty(value = "流程编号")
+    private java.lang.String prcNum;
+
+	/**流程名称*/
+	@Excel(name = "流程名称", width = 15)
+    @ApiModelProperty(value = "流程名称")
+    private java.lang.String prcName;
+
+	/**评估人id*/
+	@Excel(name = "评估人id", width = 15)
+    @ApiModelProperty(value = "评估人id")
+    private java.lang.String evaluatorId;
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/EvaluationTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/EvaluationTypeEnum.java
new file mode 100644
index 000000000..06d9043c6
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/EvaluationTypeEnum.java
@@ -0,0 +1,51 @@
+package com.jero.modules.lawsTechnologyEvaluation.enums;
+
+import com.alibaba.druid.util.StringUtils;
+import com.jero.common.constant.enums.CutEnum;
+
+/**
+ * 评估类型枚举类
+ */
+public enum EvaluationTypeEnum {
+    FEED_BACK("反馈评估","Feedback evaluation"),
+    ITEM("条款评估","Item evaluation"),
+    ;
+
+    String name;
+    String value;
+
+    private EvaluationTypeEnum(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public static String getTextByValue(String value,String cut) {
+        EvaluationTypeEnum[] values = values();
+        for (EvaluationTypeEnum certificationProgressEnum : values) {
+            if (certificationProgressEnum.value.equals(value)) {
+                if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+                    return certificationProgressEnum.name;
+                }else {
+                    return certificationProgressEnum.value;
+                }
+            }
+        }
+        return null;
+    }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java
new file mode 100644
index 000000000..da6be153c
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java
@@ -0,0 +1,17 @@
+package com.jero.modules.lawsTechnologyEvaluation.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 法规技术评估表-流程明细
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+public interface LawsTechnologyEvaluationFlowDetailEOMapper extends BaseMapper<LawsTechnologyEvaluationFlowDetailEO> {
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml
new file mode 100644
index 000000000..72cc2a9f6
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationFlowDetailEOMapper">
+    <resultMap id="LawsTechnologyEvaluationFlowDetailEOResultMap" type="com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="laws_technology_evaluation_id" property="lawsTechnologyEvaluationId" />
+        <result column="acti_proc_inst_id" property="actiProcInstId" />
+        <result column="prc_num" property="prcNum" />
+        <result column="prc_name" property="prcName" />
+        <result column="evaluator_id" property="evaluatorId" />
+    </resultMap>
+</mapper>
\ No newline at end of file
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java
index 65a302e4c..ba0402ba0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java
@@ -1,5 +1,7 @@
 package com.jero.modules.lawsTechnologyEvaluation.service;
 
+import com.alibaba.fastjson.JSONObject;
+import com.jero.common.api.vo.Result;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import java.util.List;
@@ -58,4 +60,11 @@ public interface ILawsTechnologyEvaluationEOService extends IService<LawsTechnol
 	 * @return
 	 */
     List<LawsTechnologyEvaluationEO> queryList();
+
+	/**
+	 * 流程调用
+	 * @param jsonObject
+	 * @return
+	 */
+    Result<?> processCall(JSONObject jsonObject);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationFlowDetailEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationFlowDetailEOService.java
new file mode 100644
index 000000000..89af12bd5
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationFlowDetailEOService.java
@@ -0,0 +1,70 @@
+package com.jero.modules.lawsTechnologyEvaluation.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.jero.common.api.vo.Result;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 法规技术评估表-流程明细
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+public interface ILawsTechnologyEvaluationFlowDetailEOService extends IService<LawsTechnologyEvaluationFlowDetailEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param lawsTechnologyEvaluationFlowDetailEO
+	 * @return
+	 */
+    void add(LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param lawsTechnologyEvaluationFlowDetailEO
+	 * @return
+	 */
+    void editById(LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    LawsTechnologyEvaluationFlowDetailEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<LawsTechnologyEvaluationFlowDetailEO> queryList();
+
+	/**
+	 * 流程调用
+	 * @param jsonObject
+	 * @return
+	 */
+    Result<?> processCall(JSONObject jsonObject);
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
index 5d7100f1d..737583f85 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
@@ -1,9 +1,20 @@
 package com.jero.modules.lawsTechnologyEvaluation.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.jero.common.api.vo.Result;
+import com.jero.common.exception.JeroBootException;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
 import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationEOMapper;
 import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService;
+import com.jero.modules.project.enums.OperatorTypeEnum;
+import com.jero.modules.project.enums.RequestSourceEnum;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Date;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -86,4 +97,26 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
     public List<LawsTechnologyEvaluationEO> queryList() {
         return list();
     }
+
+	@Override
+	public Result<?> processCall(JSONObject jsonObject) {
+		String requestSource = jsonObject.getString("requestSource");
+		if(StringUtils.isEmpty(requestSource)){
+			throw new JeroBootException("请求来源不能为空！");
+		}
+		if(!StringUtils.equals(requestSource, RequestSourceEnum.WORK_FLOW.getValue())){
+			throw new JeroBootException("来源有误，没有权限调用该接口！");
+		}
+
+		String operatorType = jsonObject.getString("operatorType");
+		if(StringUtils.isEmpty(operatorType)){
+			throw new JeroBootException("操作类型不能为空！");
+		}
+		if(StringUtils.equals(operatorType, OperatorTypeEnum.ADD.getValue())){
+			LawsTechnologyEvaluationEO lawsTechnologyEvaluationEO = JSONObject.parseObject(JSONObject.toJSONString(jsonObject.get("lawsTechnologyEvaluationEO")),LawsTechnologyEvaluationEO.class);
+			this.save(lawsTechnologyEvaluationEO);
+		}
+
+		return new Result<>().success("调用成功！");
+	}
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java
new file mode 100644
index 000000000..dbf699f42
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java
@@ -0,0 +1,129 @@
+package com.jero.modules.lawsTechnologyEvaluation.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.jero.common.api.vo.Result;
+import com.jero.common.exception.JeroBootException;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
+import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationFlowDetailEOMapper;
+import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationFlowDetailEOService;
+import com.jero.modules.project.enums.OperatorTypeEnum;
+import com.jero.modules.project.enums.RequestSourceEnum;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 法规技术评估表-流程明细
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+@Service
+public class LawsTechnologyEvaluationFlowDetailEOServiceImpl extends ServiceImpl<LawsTechnologyEvaluationFlowDetailEOMapper, LawsTechnologyEvaluationFlowDetailEO> implements ILawsTechnologyEvaluationFlowDetailEOService {
+
+	/**
+	 * 保存
+	 *
+	 * @param lawsTechnologyEvaluationFlowDetailEO
+	 * @return
+	 */
+	@Override
+    public void add(LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO) {
+        Date now = new Date();
+        lawsTechnologyEvaluationFlowDetailEO.setCreateTime(now);
+        lawsTechnologyEvaluationFlowDetailEO.setUpdateTime(now);
+        save(lawsTechnologyEvaluationFlowDetailEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param lawsTechnologyEvaluationFlowDetailEO
+	 * @return
+	 */
+	@Override
+    public void editById(LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO) {
+    	Date now = new Date();
+        lawsTechnologyEvaluationFlowDetailEO.setUpdateTime(now);
+    	saveOrUpdate(lawsTechnologyEvaluationFlowDetailEO);
+    }
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public void deleteById(String id) {
+        removeById(id);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public void deleteByIds(List<String> ids) {
+        removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public LawsTechnologyEvaluationFlowDetailEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<LawsTechnologyEvaluationFlowDetailEO> queryList() {
+        return list();
+    }
+
+	@Override
+	public Result<?> processCall(JSONObject jsonObject) {
+		String requestSource = jsonObject.getString("requestSource");
+		if(StringUtils.isEmpty(requestSource)){
+			throw new JeroBootException("请求来源不能为空！");
+		}
+		if(!StringUtils.equals(requestSource, RequestSourceEnum.WORK_FLOW.getValue())){
+			throw new JeroBootException("来源有误，没有权限调用该接口！");
+		}
+
+		String operatorType = jsonObject.getString("operatorType");
+		if(StringUtils.isEmpty(operatorType)){
+			throw new JeroBootException("操作类型不能为空！");
+		}
+		if(StringUtils.equals(operatorType, OperatorTypeEnum.ADD.getValue())){
+			JSONArray lawsTechnologyEvaluationListArray = jsonObject.getJSONArray("lawsTechnologyEvaluationList");
+			List<LawsTechnologyEvaluationFlowDetailEO> detailList = new ArrayList<>();
+			LawsTechnologyEvaluationFlowDetailEO detailEO = null;
+			for (Object lawsTechnologyEvaluation : lawsTechnologyEvaluationListArray) {
+				detailEO = JSONObject.parseObject(JSONObject.toJSONString(lawsTechnologyEvaluation),LawsTechnologyEvaluationFlowDetailEO.class);
+				detailList.add(detailEO);
+			}
+			if(CollectionUtils.isNotEmpty(detailList)){
+				this.saveBatch(detailList);
+			}
+		}
+
+		return new Result<>().success("调用成功！");
+	}
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java
index bf3b4ca11..b39663dc2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java
@@ -71,6 +71,9 @@ public class workFlowController {
         }else if(StringUtils.equals(type,FlowTypeEnum.FGYJSJLC.getValue())){
             jsonObject.put("id", FlowTypeEnum.FGYJSJLC.getProcessDefinitionKey());
             return this.activiti_define_start(jsonObject);
+        }else if(StringUtils.equals(type,FlowTypeEnum.FGJSPG.getValue())){
+            jsonObject.put("processDefinitionKey", FlowTypeEnum.FGJSPG.getProcessDefinitionKey());
+            return this.startLawsTechnologyEvaluationProcess(jsonObject);
         }else{
             return null;
         }
@@ -192,4 +195,12 @@ public class workFlowController {
         conditionAssessmentEOService.addOrUpdate(conditionAssessmentEO);
     }
 
+    /**
+     * 启动流程-法规技术评估流程
+     * @param jsonObject
+     * @return
+     */
+    public Result startLawsTechnologyEvaluationProcess(@RequestBody JSONObject jsonObject){
+        return  workFlowFeignClient.startLawsTechnologyEvaluationProcess(jsonObject);
+    }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java
index 27ed1817a..cbecf5705 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java
@@ -45,7 +45,9 @@ public class TaskCommonQuery {
 	@ApiModelProperty(value = "流程类型")
 	private String prcType;
 
-	private String prcTypes = FlowTypeEnum.RWQRLC.getValue() + "," + FlowTypeEnum.FGYJSJLC.getValue();
+	private String prcTypes = FlowTypeEnum.RWQRLC.getValue()
+			+ "," + FlowTypeEnum.FGYJSJLC.getValue()
+			+ "," + FlowTypeEnum.FGJSPG.getValue();
 
 	@ApiModelProperty(value = "高级搜索字符串")
 	private String advanceSearchVOStr;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java
index 159c3a27b..d41f6e887 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java
@@ -10,6 +10,7 @@ public enum FlowTypeEnum {
     PREHOMOQRLC("3","prehomo确认流程","PREHOMOQRLC","prehomo确认流程","prehomoqrlc"),
     YZFHXSCLC("4","验证符合性审查流程","YZFHXSCLC","验证符合性审查流程","yzfhxsclc"),
     FGYJSJLC("5","法规意见收集流程","FGYJSJLC","法规意见收集流程","fgyjsjlc"),
+    FGJSPG("6","法规技术评估","FGJSPG","法规技术评估流程","fgjspglc"),
     ;
 
     private String value;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java
index f6a1f8a0a..59d7da450 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java
@@ -137,4 +137,12 @@ public interface WorkFlowFeignClient {
 
     @RequestMapping(value = "/bat-wkflow/task/completeTaskByPids",method = RequestMethod.GET)
     Result<String> completeTaskByPids(@RequestParam("actiProcInstIds") String actiProcInstIds);
+
+    /**
+     * 启动流程-法规技术评估流程
+     * @param jsonObject
+     * @return
+     */
+    @RequestMapping(value = "/bat-wkflow/startLawsTechnologyEvaluationProcess",method = RequestMethod.POST,headers = {"content-type=application/json"})
+    Result<String> startLawsTechnologyEvaluationProcess(String jsonObject);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java
index f41e56c44..78da46005 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java
@@ -157,4 +157,14 @@ public class WorkFlowFeignClientImpl{
     public List<Map<String, Object>> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId,@RequestParam("cut") String cut,@RequestParam("prcType") String prcType, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){
         return  workFlowFeignClient.queryProcessHistoryByPrcId(prcId,cut,prcType,sortWord,shunxu);
     }
+
+    /**
+     * 启动流程-法规技术评估流程
+     * @param jsonObject
+     * @return
+     */
+    public Result startLawsTechnologyEvaluationProcess(@RequestBody net.sf.json.JSONObject jsonObject){
+        Result<String> stringWrapper = workFlowFeignClient.startLawsTechnologyEvaluationProcess(jsonObject.toString());
+        return Result.OK(stringWrapper.getResult());
+    }
 }

From 3836acb7ce6f0521cda47ece4ee00221f361dd7d Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 11 Jul 2022 19:34:53 +0800
Subject: [PATCH 009/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=E5=BC=80=E5=8F=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql |  57 +++++
 .../com/jero/config/shiro/ShiroConfig.java    |   2 +
 ...valuationComplianceResultEOController.java | 170 +++++++++++++++
 ...ologyEvaluationFlowDetailEOController.java |   4 +-
 ...ologyEvaluationItemResultEOController.java | 197 ++++++++++++++++++
 ...echnologyEvaluationResultEOController.java | 186 +++++++++++++++++
 ...echnologyEvaluationComplianceResultEO.java |  79 +++++++
 .../LawsTechnologyEvaluationItemResultEO.java | 132 ++++++++++++
 .../LawsTechnologyEvaluationResultEO.java     | 101 +++++++++
 ...ogyEvaluationComplianceResultEOMapper.java |  17 ++
 ...echnologyEvaluationItemResultEOMapper.java |  17 ++
 ...awsTechnologyEvaluationResultEOMapper.java |  17 ++
 ...logyEvaluationComplianceResultEOMapper.xml |  15 ++
 ...TechnologyEvaluationItemResultEOMapper.xml |  25 +++
 ...LawsTechnologyEvaluationResultEOMapper.xml |  19 ++
 ...gyEvaluationComplianceResultEOService.java |  61 ++++++
 ...chnologyEvaluationItemResultEOService.java |  76 +++++++
 ...wsTechnologyEvaluationResultEOService.java |  68 ++++++
 ...aluationComplianceResultEOServiceImpl.java |  89 ++++++++
 ...LawsTechnologyEvaluationEOServiceImpl.java |   3 +
 ...logyEvaluationItemResultEOServiceImpl.java | 150 +++++++++++++
 ...chnologyEvaluationResultEOServiceImpl.java | 138 ++++++++++++
 22 files changed, 1621 insertions(+), 2 deletions(-)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationComplianceResultEOController.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationComplianceResultEO.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationComplianceResultEOMapper.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationItemResultEOMapper.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationResultEOMapper.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationComplianceResultEOMapper.xml
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationItemResultEOMapper.xml
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationResultEOMapper.xml
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationComplianceResultEOService.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 12b54b750..6f67d579a 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -265,3 +265,60 @@ VALUES
     'fgjspglc','0006','2022-07-11 15:45:33',NULL,NULL,'法规技术评估流程',NULL,
     0,'15007',NULL,NULL,'json','4bdf0b396b4aa6ea10dd5e19956a1e22',NULL
 );
+
+-- 法规技术评估-条款信息评估结果表
+CREATE TABLE `laws_technology_evaluation_item_result`  (
+   `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+   `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+   `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
+   `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+   `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
+   `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+   `item_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '条款id',
+   `item_num` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '条款号',
+   `item_name` varchar(600) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '条款名称',
+   `item_content` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '条款内容',
+   `evaluation_methods` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '评估方式',
+   `technical_file_name` varchar(600) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '技术文件名称',
+   `section` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '章节',
+   `opinion` varchar(600) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '意见',
+   `accessory_file` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件',
+   `compliance_result` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '符合性结果',
+   `evaluator_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '评估人id',
+   `acti_proc_inst_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例id',
+   `sponsor_feedback` varchar(600) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发起人反馈',
+   `laws_technology_evaluation_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规技术评估表id',
+   PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估-条款信息评估结果表' ROW_FORMAT = Dynamic;
+
+-- 法规技术评估-评估人反馈-符合性结果表
+CREATE TABLE `laws_technology_evaluation_compliance_result`  (
+     `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+     `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+     `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
+     `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+     `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
+     `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+     `laws_technology_evaluation_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规技术评估表id',
+     `compliance_result` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '符合性结果',
+     `acti_proc_inst_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例id',
+     PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估-评估人反馈-符合性结果表' ROW_FORMAT = Dynamic;
+
+-- 法规技术评估-评估结果表
+CREATE TABLE `laws_technology_evaluation_result`  (
+      `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+      `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+      `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
+      `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+      `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
+      `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+      `laws_technology_evaluation_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规技术评估表id',
+      `related_section` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关章节',
+      `issue_or_suggest` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题/建议',
+      `reason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '理由',
+      `accessory_file` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件',
+      `submit_time` datetime NULL DEFAULT NULL COMMENT '提出时间',
+      `acti_proc_inst_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例id',
+      PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估-评估结果表' ROW_FORMAT = Dynamic;
diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
index d09b3c92b..a57e7db62 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
@@ -149,6 +149,8 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/lawsTechnologyEvaluation/lawsTechnologyEvaluationFlowDetailEO/processCall", "anon");
         // 法规技术评估表 工作流处理数据接口排除
         filterChainDefinitionMap.put("/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/processCall", "anon");
+        // 法规技术评估-条款信息评估结果表 工作流处理数据接口排除
+        filterChainDefinitionMap.put("/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/processCall", "anon");
         filterChainDefinitionMap.put("/sys/user/querySysUserListByIdList", "anon"); // 工作流根据用户idList获取用户信息接口
 
         // 添加自己的过滤器并且取名为jwt
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationComplianceResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationComplianceResultEOController.java
new file mode 100644
index 000000000..2cca22297
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationComplianceResultEOController.java
@@ -0,0 +1,170 @@
+package com.jero.modules.lawsTechnologyEvaluation.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO;
+import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationComplianceResultEOService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: 法规技术评估-评估人反馈-符合性结果表
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+@Api(tags="法规技术评估-评估人反馈-符合性结果表")
+@RestController
+@RequestMapping("/lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO")
+@Slf4j
+public class LawsTechnologyEvaluationComplianceResultEOController extends JeroController<LawsTechnologyEvaluationComplianceResultEO, ILawsTechnologyEvaluationComplianceResultEOService> {
+	@Autowired
+	private ILawsTechnologyEvaluationComplianceResultEOService lawsTechnologyEvaluationComplianceResultEOService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param lawsTechnologyEvaluationComplianceResultEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-评估人反馈-符合性结果表-分页列表查询")
+	@ApiOperation(value="法规技术评估-评估人反馈-符合性结果表-分页列表查询", notes="法规技术评估-评估人反馈-符合性结果表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<LawsTechnologyEvaluationComplianceResultEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationComplianceResultEO, req.getParameterMap());
+		Page<LawsTechnologyEvaluationComplianceResultEO> page = new Page<LawsTechnologyEvaluationComplianceResultEO>(pageNo, pageSize);
+		IPage<LawsTechnologyEvaluationComplianceResultEO> pageList = lawsTechnologyEvaluationComplianceResultEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-评估人反馈-符合性结果表-列表查询")
+    @ApiOperation(value="法规技术评估-评估人反馈-符合性结果表-列表查询", notes="法规技术评估-评估人反馈-符合性结果表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<LawsTechnologyEvaluationComplianceResultEO>> queryList() {
+        List<LawsTechnologyEvaluationComplianceResultEO> list = lawsTechnologyEvaluationComplianceResultEOService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param lawsTechnologyEvaluationComplianceResultEO
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-评估人反馈-符合性结果表-添加")
+	@ApiOperation(value="法规技术评估-评估人反馈-符合性结果表-添加", notes="法规技术评估-评估人反馈-符合性结果表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO) {
+		lawsTechnologyEvaluationComplianceResultEOService.add(lawsTechnologyEvaluationComplianceResultEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param lawsTechnologyEvaluationComplianceResultEO
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-评估人反馈-符合性结果表-编辑")
+	@ApiOperation(value="法规技术评估-评估人反馈-符合性结果表-编辑", notes="法规技术评估-评估人反馈-符合性结果表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO) {
+		lawsTechnologyEvaluationComplianceResultEOService.editById(lawsTechnologyEvaluationComplianceResultEO);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-评估人反馈-符合性结果表-通过id删除")
+	@ApiOperation(value="法规技术评估-评估人反馈-符合性结果表-通过id删除", notes="法规技术评估-评估人反馈-符合性结果表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		lawsTechnologyEvaluationComplianceResultEOService.deleteById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-评估人反馈-符合性结果表-批量删除")
+	@ApiOperation(value="法规技术评估-评估人反馈-符合性结果表-批量删除", notes="法规技术评估-评估人反馈-符合性结果表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.lawsTechnologyEvaluationComplianceResultEOService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-评估人反馈-符合性结果表-通过id查询")
+	@ApiOperation(value="法规技术评估-评估人反馈-符合性结果表-通过id查询", notes="法规技术评估-评估人反馈-符合性结果表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO = lawsTechnologyEvaluationComplianceResultEOService.queryById(id);
+		if(lawsTechnologyEvaluationComplianceResultEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(lawsTechnologyEvaluationComplianceResultEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param lawsTechnologyEvaluationComplianceResultEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO) {
+        return super.exportXls(request, lawsTechnologyEvaluationComplianceResultEO, LawsTechnologyEvaluationComplianceResultEO.class, "法规技术评估-评估人反馈-符合性结果表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, LawsTechnologyEvaluationComplianceResultEO.class);
+    }
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java
index 38fa76c5a..499b50d43 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java
@@ -174,8 +174,8 @@ public class LawsTechnologyEvaluationFlowDetailEOController extends JeroControll
 	  * @param jsonObject
 	  * @return
 	  */
-	 @AutoLog(value = "法规意见收集-流程明细表-流程调用")
-	 @ApiOperation(value="法规意见收集-流程明细表-流程调用", notes="法规意见收集-流程明细表-流程调用")
+	 @AutoLog(value = "法规技术评估-流程明细表-流程调用")
+	 @ApiOperation(value="法规技术评估-流程明细表-流程调用", notes="法规技术评估-流程明细表-流程调用")
 	 @PostMapping(value = "/processCall")
 	 public Result<?> processCall(@RequestBody JSONObject jsonObject){
 		 return this.lawsTechnologyEvaluationFlowDetailEOService.processCall(jsonObject);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java
new file mode 100644
index 000000000..ccf5dcd61
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java
@@ -0,0 +1,197 @@
+package com.jero.modules.lawsTechnologyEvaluation.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSONObject;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationItemResultEO;
+import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationItemResultEOService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: 法规技术评估-条款信息评估结果表
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+@Api(tags="法规技术评估-条款信息评估结果表")
+@RestController
+@RequestMapping("/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO")
+@Slf4j
+public class LawsTechnologyEvaluationItemResultEOController extends JeroController<LawsTechnologyEvaluationItemResultEO, ILawsTechnologyEvaluationItemResultEOService> {
+	@Autowired
+	private ILawsTechnologyEvaluationItemResultEOService lawsTechnologyEvaluationItemResultEOService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param lawsTechnologyEvaluationItemResultEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-条款信息评估结果表-分页列表查询")
+	@ApiOperation(value="法规技术评估-条款信息评估结果表-分页列表查询", notes="法规技术评估-条款信息评估结果表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<LawsTechnologyEvaluationItemResultEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationItemResultEO, req.getParameterMap());
+		Page<LawsTechnologyEvaluationItemResultEO> page = new Page<LawsTechnologyEvaluationItemResultEO>(pageNo, pageSize);
+		IPage<LawsTechnologyEvaluationItemResultEO> pageList = lawsTechnologyEvaluationItemResultEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-条款信息评估结果表-列表查询")
+    @ApiOperation(value="法规技术评估-条款信息评估结果表-列表查询", notes="法规技术评估-条款信息评估结果表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<LawsTechnologyEvaluationItemResultEO>> queryList() {
+        List<LawsTechnologyEvaluationItemResultEO> list = lawsTechnologyEvaluationItemResultEOService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param lawsTechnologyEvaluationItemResultEO
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-条款信息评估结果表-添加")
+	@ApiOperation(value="法规技术评估-条款信息评估结果表-添加", notes="法规技术评估-条款信息评估结果表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO) {
+		lawsTechnologyEvaluationItemResultEOService.add(lawsTechnologyEvaluationItemResultEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param lawsTechnologyEvaluationItemResultEO
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-条款信息评估结果表-编辑")
+	@ApiOperation(value="法规技术评估-条款信息评估结果表-编辑", notes="法规技术评估-条款信息评估结果表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO) {
+		lawsTechnologyEvaluationItemResultEOService.editById(lawsTechnologyEvaluationItemResultEO);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-条款信息评估结果表-通过id删除")
+	@ApiOperation(value="法规技术评估-条款信息评估结果表-通过id删除", notes="法规技术评估-条款信息评估结果表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		lawsTechnologyEvaluationItemResultEOService.deleteById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-条款信息评估结果表-批量删除")
+	@ApiOperation(value="法规技术评估-条款信息评估结果表-批量删除", notes="法规技术评估-条款信息评估结果表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.lawsTechnologyEvaluationItemResultEOService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-条款信息评估结果表-通过id查询")
+	@ApiOperation(value="法规技术评估-条款信息评估结果表-通过id查询", notes="法规技术评估-条款信息评估结果表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO = lawsTechnologyEvaluationItemResultEOService.queryById(id);
+		if(lawsTechnologyEvaluationItemResultEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(lawsTechnologyEvaluationItemResultEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param lawsTechnologyEvaluationItemResultEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO) {
+        return super.exportXls(request, lawsTechnologyEvaluationItemResultEO, LawsTechnologyEvaluationItemResultEO.class, "法规技术评估-条款信息评估结果表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, LawsTechnologyEvaluationItemResultEO.class);
+    }
+
+	 /**
+	  * 流程调用接口
+	  * @param jsonObject
+	  * @return
+	  */
+	 @AutoLog(value = "法规技术评估-条款信息评估结果表-流程调用")
+	 @ApiOperation(value="法规技术评估-条款信息评估结果表-流程调用", notes="法规技术评估-条款信息评估结果表-流程调用")
+	 @PostMapping(value = "/processCall")
+	 public Result<?> processCall(@RequestBody JSONObject jsonObject){
+		 return this.lawsTechnologyEvaluationItemResultEOService.processCall(jsonObject);
+	 }
+
+	 /**
+	  *  编辑
+	  *
+	  * @param jsonObject
+	  * @return
+	  */
+	 @AutoLog(value = "法规技术评估-条款信息评估结果表-批量更新")
+	 @ApiOperation(value="法规技术评估-条款信息评估结果表-批量更新", notes="法规技术评估-条款信息评估结果表-批量更新")
+	 @PostMapping(value = "/batchUpdate")
+	 public Result<?> batchUpdate(@RequestBody JSONObject jsonObject) {
+		 this.lawsTechnologyEvaluationItemResultEOService.batchUpdate(jsonObject);
+		 return Result.OK("编辑成功!");
+	 }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java
new file mode 100644
index 000000000..7dc83916c
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java
@@ -0,0 +1,186 @@
+package com.jero.modules.lawsTechnologyEvaluation.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSONObject;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO;
+import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationResultEOService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: 法规技术评估-评估结果表
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+@Api(tags="法规技术评估-评估结果表")
+@RestController
+@RequestMapping("/lawsTechnologyEvaluation/lawsTechnologyEvaluationResultEO")
+@Slf4j
+public class LawsTechnologyEvaluationResultEOController extends JeroController<LawsTechnologyEvaluationResultEO, ILawsTechnologyEvaluationResultEOService> {
+	@Autowired
+	private ILawsTechnologyEvaluationResultEOService lawsTechnologyEvaluationResultEOService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param lawsTechnologyEvaluationResultEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-评估结果表-分页列表查询")
+	@ApiOperation(value="法规技术评估-评估结果表-分页列表查询", notes="法规技术评估-评估结果表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<LawsTechnologyEvaluationResultEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationResultEO, req.getParameterMap());
+		Page<LawsTechnologyEvaluationResultEO> page = new Page<LawsTechnologyEvaluationResultEO>(pageNo, pageSize);
+		IPage<LawsTechnologyEvaluationResultEO> pageList = lawsTechnologyEvaluationResultEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-评估结果表-列表查询")
+    @ApiOperation(value="法规技术评估-评估结果表-列表查询", notes="法规技术评估-评估结果表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<LawsTechnologyEvaluationResultEO>> queryList() {
+        List<LawsTechnologyEvaluationResultEO> list = lawsTechnologyEvaluationResultEOService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param lawsTechnologyEvaluationResultEO
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-评估结果表-添加")
+	@ApiOperation(value="法规技术评估-评估结果表-添加", notes="法规技术评估-评估结果表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO) {
+		lawsTechnologyEvaluationResultEOService.add(lawsTechnologyEvaluationResultEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param lawsTechnologyEvaluationResultEO
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-评估结果表-编辑")
+	@ApiOperation(value="法规技术评估-评估结果表-编辑", notes="法规技术评估-评估结果表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO) {
+		lawsTechnologyEvaluationResultEOService.editById(lawsTechnologyEvaluationResultEO);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-评估结果表-通过id删除")
+	@ApiOperation(value="法规技术评估-评估结果表-通过id删除", notes="法规技术评估-评估结果表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		lawsTechnologyEvaluationResultEOService.deleteById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-评估结果表-批量删除")
+	@ApiOperation(value="法规技术评估-评估结果表-批量删除", notes="法规技术评估-评估结果表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.lawsTechnologyEvaluationResultEOService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "法规技术评估-评估结果表-通过id查询")
+	@ApiOperation(value="法规技术评估-评估结果表-通过id查询", notes="法规技术评估-评估结果表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO = lawsTechnologyEvaluationResultEOService.queryById(id);
+		if(lawsTechnologyEvaluationResultEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(lawsTechnologyEvaluationResultEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param lawsTechnologyEvaluationResultEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO) {
+        return super.exportXls(request, lawsTechnologyEvaluationResultEO, LawsTechnologyEvaluationResultEO.class, "法规技术评估-评估结果表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, LawsTechnologyEvaluationResultEO.class);
+    }
+
+
+	 /**
+	  *   添加
+	  *
+	  * @param json
+	  * @return
+	  */
+	 @AutoLog(value = "法规技术评估-评估结果表-批量添加")
+	 @ApiOperation(value="法规技术评估-评估结果表-批量添加", notes="法规技术评估-评估结果表-批量添加")
+	 @PostMapping(value = "/evaluatorSaveResult")
+	 public Result<?> evaluatorSaveResult(@RequestBody JSONObject json) {
+		 lawsTechnologyEvaluationResultEOService.evaluatorSaveResult(json);
+		 return Result.OK("添加成功！");
+	 }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationComplianceResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationComplianceResultEO.java
new file mode 100644
index 000000000..d642d1c95
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationComplianceResultEO.java
@@ -0,0 +1,79 @@
+package com.jero.modules.lawsTechnologyEvaluation.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 法规技术评估-评估人反馈-符合性结果表
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+@Data
+@TableName("laws_technology_evaluation_compliance_result")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="laws_technology_evaluation_compliance_result对象", description="法规技术评估-评估人反馈-符合性结果表")
+public class LawsTechnologyEvaluationComplianceResultEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+
+	/**法规技术评估表id*/
+	@Excel(name = "法规技术评估表id", width = 15)
+    @ApiModelProperty(value = "法规技术评估表id")
+    private java.lang.String lawsTechnologyEvaluationId;
+
+	/**符合性结果*/
+	@Excel(name = "符合性结果", width = 15)
+    @ApiModelProperty(value = "符合性结果")
+    private java.lang.String complianceResult;
+
+	/**流程实例id*/
+	@Excel(name = "流程实例id", width = 15)
+    @ApiModelProperty(value = "流程实例id")
+    private java.lang.String actiProcInstId;
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java
new file mode 100644
index 000000000..0ef568162
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java
@@ -0,0 +1,132 @@
+package com.jero.modules.lawsTechnologyEvaluation.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 法规技术评估-条款信息评估结果表
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+@Data
+@TableName("laws_technology_evaluation_item_result")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="laws_technology_evaluation_item_result对象", description="法规技术评估-条款信息评估结果表")
+public class LawsTechnologyEvaluationItemResultEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+
+	/**条款id*/
+	@Excel(name = "条款id", width = 15)
+    @ApiModelProperty(value = "条款id")
+    private java.lang.String itemId;
+
+	/**条款号*/
+	@Excel(name = "条款号", width = 15)
+    @ApiModelProperty(value = "条款号")
+    private java.lang.String itemNum;
+
+	/**条款名称*/
+	@Excel(name = "条款名称", width = 15)
+    @ApiModelProperty(value = "条款名称")
+    private java.lang.String itemName;
+
+	/**条款内容*/
+	@Excel(name = "条款内容", width = 15)
+    @ApiModelProperty(value = "条款内容")
+    private java.lang.String itemContent;
+
+	/**评估方式*/
+	@Excel(name = "评估方式", width = 15)
+    @ApiModelProperty(value = "评估方式")
+    private java.lang.String evaluationMethods;
+
+	/**技术文件名称*/
+	@Excel(name = "技术文件名称", width = 15)
+    @ApiModelProperty(value = "技术文件名称")
+    private java.lang.String technicalFileName;
+
+	/**章节*/
+	@Excel(name = "章节", width = 15)
+    @ApiModelProperty(value = "章节")
+    private java.lang.String section;
+
+	/**意见*/
+	@Excel(name = "意见", width = 15)
+    @ApiModelProperty(value = "意见")
+    private java.lang.String opinion;
+
+	/**附件*/
+	@Excel(name = "附件", width = 15)
+    @ApiModelProperty(value = "附件")
+    private java.lang.String accessoryFile;
+
+	/**符合性结果*/
+	@Excel(name = "符合性结果", width = 15)
+    @ApiModelProperty(value = "符合性结果")
+    private java.lang.String complianceResult;
+
+	/**评估人id*/
+	@Excel(name = "评估人id", width = 15)
+    @ApiModelProperty(value = "评估人id")
+    private java.lang.String evaluatorId;
+
+	/**流程实例id*/
+	@Excel(name = "流程实例id", width = 15)
+    @ApiModelProperty(value = "流程实例id")
+    private java.lang.String actiProcInstId;
+
+	/**发起人反馈*/
+	@Excel(name = "发起人反馈", width = 15)
+    @ApiModelProperty(value = "发起人反馈")
+    private java.lang.String sponsorFeedback;
+
+    /**法规技术评估表id*/
+    @ApiModelProperty(value = "法规技术评估表id")
+    private java.lang.String lawsTechnologyEvaluationId;
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java
new file mode 100644
index 000000000..1777b8396
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java
@@ -0,0 +1,101 @@
+package com.jero.modules.lawsTechnologyEvaluation.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 法规技术评估-评估结果表
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+@Data
+@TableName("laws_technology_evaluation_result")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="laws_technology_evaluation_result对象", description="法规技术评估-评估结果表")
+public class LawsTechnologyEvaluationResultEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+
+	/**法规技术评估表id*/
+	@Excel(name = "法规技术评估表id", width = 15)
+    @ApiModelProperty(value = "法规技术评估表id")
+    private java.lang.String lawsTechnologyEvaluationId;
+
+	/**相关章节*/
+	@Excel(name = "相关章节", width = 15)
+    @ApiModelProperty(value = "相关章节")
+    private java.lang.String relatedSection;
+
+	/**问题/建议*/
+	@Excel(name = "问题/建议", width = 15)
+    @ApiModelProperty(value = "问题/建议")
+    private java.lang.String issueOrSuggest;
+
+	/**理由*/
+	@Excel(name = "理由", width = 15)
+    @ApiModelProperty(value = "理由")
+    private java.lang.String reason;
+
+	/**附件*/
+	@Excel(name = "附件", width = 15)
+    @ApiModelProperty(value = "附件")
+    private java.lang.String accessoryFile;
+
+	/**提出时间*/
+	@Excel(name = "提出时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "提出时间")
+    private java.util.Date submitTime;
+
+	/**流程实例id*/
+	@Excel(name = "流程实例id", width = 15)
+    @ApiModelProperty(value = "流程实例id")
+    private java.lang.String actiProcInstId;
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationComplianceResultEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationComplianceResultEOMapper.java
new file mode 100644
index 000000000..4306057ae
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationComplianceResultEOMapper.java
@@ -0,0 +1,17 @@
+package com.jero.modules.lawsTechnologyEvaluation.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 法规技术评估-评估人反馈-符合性结果表
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+public interface LawsTechnologyEvaluationComplianceResultEOMapper extends BaseMapper<LawsTechnologyEvaluationComplianceResultEO> {
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationItemResultEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationItemResultEOMapper.java
new file mode 100644
index 000000000..9e46327ff
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationItemResultEOMapper.java
@@ -0,0 +1,17 @@
+package com.jero.modules.lawsTechnologyEvaluation.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationItemResultEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 法规技术评估-条款信息评估结果表
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+public interface LawsTechnologyEvaluationItemResultEOMapper extends BaseMapper<LawsTechnologyEvaluationItemResultEO> {
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationResultEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationResultEOMapper.java
new file mode 100644
index 000000000..871666f41
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationResultEOMapper.java
@@ -0,0 +1,17 @@
+package com.jero.modules.lawsTechnologyEvaluation.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 法规技术评估-评估结果表
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+public interface LawsTechnologyEvaluationResultEOMapper extends BaseMapper<LawsTechnologyEvaluationResultEO> {
+
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationComplianceResultEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationComplianceResultEOMapper.xml
new file mode 100644
index 000000000..bb7b021b5
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationComplianceResultEOMapper.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationComplianceResultEOMapper">
+    <resultMap id="LawsTechnologyEvaluationComplianceResultEOResultMap" type="com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="laws_technology_evaluation_id" property="lawsTechnologyEvaluationId" />
+        <result column="compliance_result" property="complianceResult" />
+        <result column="acti_proc_inst_id" property="actiProcInstId" />
+    </resultMap>
+</mapper>
\ No newline at end of file
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationItemResultEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationItemResultEOMapper.xml
new file mode 100644
index 000000000..36a1ce561
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationItemResultEOMapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationItemResultEOMapper">
+    <resultMap id="LawsTechnologyEvaluationItemResultEOResultMap" type="com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationItemResultEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="item_id" property="itemId" />
+        <result column="item_num" property="itemNum" />
+        <result column="item_name" property="itemName" />
+        <result column="item_content" property="itemContent" />
+        <result column="evaluation_methods" property="evaluationMethods" />
+        <result column="technical_file_name" property="technicalFileName" />
+        <result column="section" property="section" />
+        <result column="opinion" property="opinion" />
+        <result column="accessory_file" property="accessoryFile" />
+        <result column="compliance_result" property="complianceResult" />
+        <result column="evaluator_id" property="evaluatorId" />
+        <result column="acti_proc_inst_id" property="actiProcInstId" />
+        <result column="sponsor_feedback" property="sponsorFeedback" />
+    </resultMap>
+</mapper>
\ No newline at end of file
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationResultEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationResultEOMapper.xml
new file mode 100644
index 000000000..f25dba1c3
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationResultEOMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationResultEOMapper">
+    <resultMap id="LawsTechnologyEvaluationResultEOResultMap" type="com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="laws_technology_evaluation_id" property="lawsTechnologyEvaluationId" />
+        <result column="related_section" property="relatedSection" />
+        <result column="issue_or_suggest" property="issueOrSuggest" />
+        <result column="reason" property="reason" />
+        <result column="accessory_file" property="accessoryFile" />
+        <result column="submit_time" property="submitTime" />
+        <result column="acti_proc_inst_id" property="actiProcInstId" />
+    </resultMap>
+</mapper>
\ No newline at end of file
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationComplianceResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationComplianceResultEOService.java
new file mode 100644
index 000000000..f93d11f0c
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationComplianceResultEOService.java
@@ -0,0 +1,61 @@
+package com.jero.modules.lawsTechnologyEvaluation.service;
+
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 法规技术评估-评估人反馈-符合性结果表
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+public interface ILawsTechnologyEvaluationComplianceResultEOService extends IService<LawsTechnologyEvaluationComplianceResultEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param lawsTechnologyEvaluationComplianceResultEO
+	 * @return
+	 */
+    void add(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param lawsTechnologyEvaluationComplianceResultEO
+	 * @return
+	 */
+    void editById(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    LawsTechnologyEvaluationComplianceResultEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<LawsTechnologyEvaluationComplianceResultEO> queryList();
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java
new file mode 100644
index 000000000..bdc60abf2
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java
@@ -0,0 +1,76 @@
+package com.jero.modules.lawsTechnologyEvaluation.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.jero.common.api.vo.Result;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationItemResultEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 法规技术评估-条款信息评估结果表
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+public interface ILawsTechnologyEvaluationItemResultEOService extends IService<LawsTechnologyEvaluationItemResultEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param lawsTechnologyEvaluationItemResultEO
+	 * @return
+	 */
+    void add(LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param lawsTechnologyEvaluationItemResultEO
+	 * @return
+	 */
+    void editById(LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    LawsTechnologyEvaluationItemResultEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<LawsTechnologyEvaluationItemResultEO> queryList();
+
+	/**
+	 * 流程调用
+	 * @param jsonObject
+	 * @return
+	 */
+    Result<?> processCall(JSONObject jsonObject);
+
+	/**
+	 * 批量更新
+	 * @param jsonObject
+	 */
+	void batchUpdate(JSONObject jsonObject);
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java
new file mode 100644
index 000000000..a1ab5e08c
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java
@@ -0,0 +1,68 @@
+package com.jero.modules.lawsTechnologyEvaluation.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 法规技术评估-评估结果表
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+public interface ILawsTechnologyEvaluationResultEOService extends IService<LawsTechnologyEvaluationResultEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param lawsTechnologyEvaluationResultEO
+	 * @return
+	 */
+    void add(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param lawsTechnologyEvaluationResultEO
+	 * @return
+	 */
+    void editById(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    LawsTechnologyEvaluationResultEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<LawsTechnologyEvaluationResultEO> queryList();
+
+	/**
+	 * 评估人保存/提交
+	 * @param json
+	 */
+    void evaluatorSaveResult(JSONObject json);
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java
new file mode 100644
index 000000000..8f8397d0c
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java
@@ -0,0 +1,89 @@
+package com.jero.modules.lawsTechnologyEvaluation.service.impl;
+
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO;
+import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationComplianceResultEOMapper;
+import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationComplianceResultEOService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 法规技术评估-评估人反馈-符合性结果表
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+@Service
+public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends ServiceImpl<LawsTechnologyEvaluationComplianceResultEOMapper, LawsTechnologyEvaluationComplianceResultEO> implements ILawsTechnologyEvaluationComplianceResultEOService {
+
+	/**
+	 * 保存
+	 *
+	 * @param lawsTechnologyEvaluationComplianceResultEO
+	 * @return
+	 */
+	@Override
+    public void add(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO) {
+        Date now = new Date();
+        lawsTechnologyEvaluationComplianceResultEO.setCreateTime(now);
+        lawsTechnologyEvaluationComplianceResultEO.setUpdateTime(now);
+        save(lawsTechnologyEvaluationComplianceResultEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param lawsTechnologyEvaluationComplianceResultEO
+	 * @return
+	 */
+	@Override
+    public void editById(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO) {
+    	Date now = new Date();
+        lawsTechnologyEvaluationComplianceResultEO.setUpdateTime(now);
+    	saveOrUpdate(lawsTechnologyEvaluationComplianceResultEO);
+    }
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public void deleteById(String id) {
+        removeById(id);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public void deleteByIds(List<String> ids) {
+        removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public LawsTechnologyEvaluationComplianceResultEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<LawsTechnologyEvaluationComplianceResultEO> queryList() {
+        return list();
+    }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
index 737583f85..ef74f3786 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
@@ -115,6 +115,9 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 		if(StringUtils.equals(operatorType, OperatorTypeEnum.ADD.getValue())){
 			LawsTechnologyEvaluationEO lawsTechnologyEvaluationEO = JSONObject.parseObject(JSONObject.toJSONString(jsonObject.get("lawsTechnologyEvaluationEO")),LawsTechnologyEvaluationEO.class);
 			this.save(lawsTechnologyEvaluationEO);
+		}else if(StringUtils.equals(operatorType,OperatorTypeEnum.UPDATE_STATUS.getValue())){
+			LawsTechnologyEvaluationEO lawsTechnologyEvaluationEO = JSONObject.parseObject(JSONObject.toJSONString(jsonObject.get("lawsTechnologyEvaluationEO")),LawsTechnologyEvaluationEO.class);
+			this.updateById(lawsTechnologyEvaluationEO);
 		}
 
 		return new Result<>().success("调用成功！");
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java
new file mode 100644
index 000000000..9f2fdc9f1
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java
@@ -0,0 +1,150 @@
+package com.jero.modules.lawsTechnologyEvaluation.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.jero.common.api.vo.Result;
+import com.jero.common.exception.JeroBootException;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationItemResultEO;
+import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationItemResultEOMapper;
+import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationItemResultEOService;
+import com.jero.modules.project.enums.OperatorTypeEnum;
+import com.jero.modules.project.enums.RequestSourceEnum;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 法规技术评估-条款信息评估结果表
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+@Service
+public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl<LawsTechnologyEvaluationItemResultEOMapper, LawsTechnologyEvaluationItemResultEO> implements ILawsTechnologyEvaluationItemResultEOService {
+
+	/**
+	 * 保存
+	 *
+	 * @param lawsTechnologyEvaluationItemResultEO
+	 * @return
+	 */
+	@Override
+    public void add(LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO) {
+        Date now = new Date();
+        lawsTechnologyEvaluationItemResultEO.setCreateTime(now);
+        lawsTechnologyEvaluationItemResultEO.setUpdateTime(now);
+        save(lawsTechnologyEvaluationItemResultEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param lawsTechnologyEvaluationItemResultEO
+	 * @return
+	 */
+	@Override
+    public void editById(LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO) {
+    	Date now = new Date();
+        lawsTechnologyEvaluationItemResultEO.setUpdateTime(now);
+    	saveOrUpdate(lawsTechnologyEvaluationItemResultEO);
+    }
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public void deleteById(String id) {
+        removeById(id);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public void deleteByIds(List<String> ids) {
+        removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public LawsTechnologyEvaluationItemResultEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<LawsTechnologyEvaluationItemResultEO> queryList() {
+        return list();
+    }
+
+	/**
+	 * 流程调用
+	 * @param jsonObject
+	 * @return
+	 */
+	@Override
+	public Result<?> processCall(JSONObject jsonObject) {
+		String requestSource = jsonObject.getString("requestSource");
+		if(StringUtils.isEmpty(requestSource)){
+			throw new JeroBootException("请求来源不能为空！");
+		}
+		if(!StringUtils.equals(requestSource, RequestSourceEnum.WORK_FLOW.getValue())){
+			throw new JeroBootException("来源有误，没有权限调用该接口！");
+		}
+
+		String operatorType = jsonObject.getString("operatorType");
+		if(StringUtils.isEmpty(operatorType)){
+			throw new JeroBootException("操作类型不能为空！");
+		}
+		if(StringUtils.equals(operatorType, OperatorTypeEnum.ADD.getValue())){
+			JSONArray itemResultEOList = jsonObject.getJSONArray("itemResultEOList");
+			List<LawsTechnologyEvaluationItemResultEO> itemResultList = new ArrayList<>();
+			LawsTechnologyEvaluationItemResultEO itemResultEO = null;
+			for (Object itemResult : itemResultEOList) {
+				itemResultEO = JSONObject.parseObject(JSONObject.toJSONString(itemResult),LawsTechnologyEvaluationItemResultEO.class);
+				itemResultList.add(itemResultEO);
+			}
+			if(CollectionUtils.isNotEmpty(itemResultList)){
+				this.saveBatch(itemResultList);
+			}
+		}
+
+		return new Result<>().success("调用成功！");
+	}
+
+	@Override
+	public void batchUpdate(JSONObject jsonObject) {
+		JSONArray itemResultArray = jsonObject.getJSONArray("itemResultList");
+		List<LawsTechnologyEvaluationItemResultEO> itemResultEOList = new ArrayList<>();
+		LawsTechnologyEvaluationItemResultEO itemResultEO = null;
+		for (Object itemResult : itemResultArray) {
+			itemResultEO = JSONObject.parseObject(JSONObject.toJSONString(itemResult),LawsTechnologyEvaluationItemResultEO.class);
+			itemResultEOList.add(itemResultEO);
+		}
+
+		if(CollectionUtils.isNotEmpty(itemResultEOList)){
+			this.updateBatchById(itemResultEOList);
+		}
+	}
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java
new file mode 100644
index 000000000..21a4f9974
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java
@@ -0,0 +1,138 @@
+package com.jero.modules.lawsTechnologyEvaluation.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO;
+import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationResultEOMapper;
+import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationComplianceResultEOService;
+import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationResultEOService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 法规技术评估-评估结果表
+ * @Author: jero-boot
+ * @Date:   2022-07-11
+ * @Version: V1.0
+ */
+@Service
+public class LawsTechnologyEvaluationResultEOServiceImpl extends ServiceImpl<LawsTechnologyEvaluationResultEOMapper, LawsTechnologyEvaluationResultEO> implements ILawsTechnologyEvaluationResultEOService {
+
+	@Autowired
+	private ILawsTechnologyEvaluationComplianceResultEOService complianceResultEOService;
+
+	/**
+	 * 保存
+	 *
+	 * @param lawsTechnologyEvaluationResultEO
+	 * @return
+	 */
+	@Override
+    public void add(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO) {
+        Date now = new Date();
+        lawsTechnologyEvaluationResultEO.setCreateTime(now);
+        lawsTechnologyEvaluationResultEO.setUpdateTime(now);
+        save(lawsTechnologyEvaluationResultEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param lawsTechnologyEvaluationResultEO
+	 * @return
+	 */
+	@Override
+    public void editById(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO) {
+    	Date now = new Date();
+        lawsTechnologyEvaluationResultEO.setUpdateTime(now);
+    	saveOrUpdate(lawsTechnologyEvaluationResultEO);
+    }
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public void deleteById(String id) {
+        removeById(id);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public void deleteByIds(List<String> ids) {
+        removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public LawsTechnologyEvaluationResultEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<LawsTechnologyEvaluationResultEO> queryList() {
+        return list();
+    }
+
+	@Override
+	public void evaluatorSaveResult(JSONObject json) {
+		String actiProcInstId = json.getString("actiProcInstId");
+		String lawsTechnologyEvaluationId = json.getString("lawsTechnologyEvaluationId");
+
+		String complianceResult = json.getString("complianceResult");
+
+		//删除符合性结果信息
+		QueryWrapper<LawsTechnologyEvaluationComplianceResultEO> removeComplianceResultWrapper = new QueryWrapper<>();
+		removeComplianceResultWrapper.lambda().eq(LawsTechnologyEvaluationComplianceResultEO::getActiProcInstId,actiProcInstId);
+		removeComplianceResultWrapper.lambda().eq(LawsTechnologyEvaluationComplianceResultEO::getLawsTechnologyEvaluationId,lawsTechnologyEvaluationId);
+		complianceResultEOService.remove(removeComplianceResultWrapper);
+
+		LawsTechnologyEvaluationComplianceResultEO complianceResultEO = new LawsTechnologyEvaluationComplianceResultEO();
+		complianceResultEO.setActiProcInstId(actiProcInstId);
+		complianceResultEO.setLawsTechnologyEvaluationId(lawsTechnologyEvaluationId);
+		complianceResultEO.setComplianceResult(complianceResult);
+		complianceResultEOService.save(complianceResultEO);
+
+		//删除之前提交的评估信息
+		QueryWrapper<LawsTechnologyEvaluationResultEO> deleteWrapper = new QueryWrapper<>();
+		deleteWrapper.lambda().eq(LawsTechnologyEvaluationResultEO::getActiProcInstId,actiProcInstId);
+		deleteWrapper.lambda().eq(LawsTechnologyEvaluationResultEO::getLawsTechnologyEvaluationId,lawsTechnologyEvaluationId);
+		this.baseMapper.delete(deleteWrapper);
+
+		JSONArray evaluationResultList = json.getJSONArray("evaluationResultList");
+		List<LawsTechnologyEvaluationResultEO> evaluationResultEOList = new ArrayList<>();
+		LawsTechnologyEvaluationResultEO evaluationResultEO = null;
+		for (Object evaluationResult : evaluationResultList) {
+			evaluationResultEO = JSONObject.parseObject(JSONObject.toJSONString(evaluationResult),LawsTechnologyEvaluationResultEO.class);
+			evaluationResultEOList.add(evaluationResultEO);
+		}
+		if(CollectionUtils.isNotEmpty(evaluationResultEOList)){
+			this.saveBatch(evaluationResultEOList);
+		}
+	}
+}

From c5bf32bc6c9488f9d8a5ca847392aa42baee5c77 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Tue, 12 Jul 2022 09:36:19 +0800
Subject: [PATCH 010/103] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=93-=E5=B8=B8=E8=A7=84=E5=AF=BC=E5=87=BA=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E5=8F=82=E6=95=B0=E7=BB=91=E5=AE=9A=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql                 | 4 ++++
 .../service/impl/ParamsCollectManifestEOServiceImpl.java      | 1 +
 .../cert/report/entity/ReportCertCategoryParamsInfoEO.java    | 4 ++++
 .../cert/report/mapper/xml/ParamsReportDetailEOMapper.xml     | 3 ++-
 .../mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml       | 1 +
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 6f67d579a..b3ad6c4a9 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -239,6 +239,10 @@ CREATE TABLE `laws_technology_evaluation`  (
    PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估表' ROW_FORMAT = DYNAMIC;
 
+-- 上报库认证类别参数信息 添加字段 2022-07-11
+ALTER TABLE `laws_weilai`.`report_cert_category_params_info`
+    ADD COLUMN `params_manifest_id` varchar(50) NULL COMMENT '上报库id' AFTER `version`;
+
 --  法规技术评估-流程明细表
 CREATE TABLE `laws_technology_evaluation_flow_detail`  (
    `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index ff8f7c289..a11e3fb76 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -1552,6 +1552,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ReportCertCategoryParamsInfoEO addCcpi = new ReportCertCategoryParamsInfoEO();
 			BeanUtils.copyProperties(ccpi, addCcpi);
 			addCcpi.setId(UUID.randomUUID().toString().replace("-",""));
+			addCcpi.setParamsManifestId(reportId); // 绑定上报库
 			addReportCertCategoryParamsInfoEOList.add(addCcpi);
 		}
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java
index 8ca30076c..80937575f 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java
@@ -29,4 +29,8 @@ public class ReportCertCategoryParamsInfoEO extends CertCategoryParamsInfoEO imp
     @ApiModelProperty(value = "发布时版本")
     private Integer version;
 
+    /**上报库id*/
+    @ApiModelProperty(value = "上报库id")
+    private String paramsManifestId;
+
 }
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
index b539d2703..819e1af14 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
@@ -103,10 +103,11 @@
         prd.id as id,
         prd.nio_number as nio_number,
         prd.params_name as params_name,
+        prd.control_type as control_type,
         rccpi.params_number as cert_number,
         rccpi.params_name as cert_params_name
         from params_report_detail prd
-        left join report_cert_category_params_info rccpi on prd.nio_number = rccpi.nio_number
+        left join report_cert_category_params_info rccpi on (prd.params_manifest_id = rccpi.params_manifest_id  and prd.nio_number = rccpi.nio_number)
         <include refid="BaseQuerySqlForExport"/>
         <if test="idList != null and idList.size > 0">
             and prd.id in
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml
index cc2317fb5..d73208e9f 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml
@@ -15,5 +15,6 @@
         <result column="cert_category" property="certCategory" />
         <result column="params_template_id" property="paramsTemplateId" />
         <result column="version" property="version" />
+        <result column="params_manifest_id" property="paramsManifestId" />
     </resultMap>
 </mapper>
\ No newline at end of file

From 8a32f6f74c3fc39ae5e0fa73b721e19d6b567dc4 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 12 Jul 2022 09:41:01 +0800
Subject: [PATCH 011/103] =?UTF-8?q?=E5=B8=83=E5=B1=80=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

---
 jero-web/src/common/lang/en-us.js             |   2 +
 jero-web/src/common/lang/zh-cn.js             |   2 +
 .../components/evaluatorFeedback.vue          | 280 ++++++++++++++++++
 .../components/evaluatorFeedbackList.vue      | 185 ++++++++++++
 .../processForm/evaluationProcess/index.vue   |  29 +-
 5 files changed, 485 insertions(+), 13 deletions(-)
 create mode 100644 jero-web/src/views/processCenter/components/evaluatorFeedback.vue
 create mode 100644 jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 9b08f22c0..5390bad63 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1112,4 +1112,6 @@ module.exports = {
   selectedStandard:'Selected standard',
   standardDecompositionDocument:'Standard decomposition document',
   pleaseSelectStandardFirst:'Please select a standard first',
+  RelevantMaterials:'RelevantMaterials',
+  evaluatorFeedback:'Evaluator feedback',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index d1d642381..e7216f749 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1112,8 +1112,10 @@ module.exports = {
   RegulationTaskConfirmationNotification:'任务确认通知',
   evaluationMethod:'评估方式',
   uploadRelevantMaterials:'相关资料上传',
+  RelevantMaterials:'相关资料',
   processBackground:'流程背景',
   selectedStandard:'所选标准',
   standardDecompositionDocument:'带入标准分解单',
   pleaseSelectStandardFirst:'请先选择标准',
+  evaluatorFeedback:'评估人反馈',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
new file mode 100644
index 000000000..3d5cfad06
--- /dev/null
+++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
@@ -0,0 +1,280 @@
+<template>
+  <div class="box">
+    <div class="box-text">
+      <div class="header-text">
+        {{title}}
+      </div>
+    </div>
+    <div class="content-text">
+      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('complianceResults')">{{$t('complianceResults')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="flag">
+                <a-radio-group style="margin-top: 2px" class="box-input" v-model="formInline.flag">
+                  <a-radio value="0">
+                    {{$t('accord')}}
+                  </a-radio>
+                  <a-radio value="1">
+                    {{$t('nonConformity')}}
+                  </a-radio>
+                </a-radio-group>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <div v-for="(item,index) in dataList" :key="index">
+          <div class="feedbackPoint">
+            {{$t('feedbackPoint')+(index+1)}}
+            <a-icon class="icon-size"
+                    @click="addData"
+                    v-if="(dataList.length-1) == index"
+                    type="plus-circle"/>
+            <a-icon class="icon-size"
+                    @click="deleteData"
+                    v-if="dataList.length > 1 && (dataList.length - 1) == index"
+                    type="minus-circle"/>
+          </div>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="relatedSection">
+                  <a-input class="box-input"
+                           :disabled="disabled"
+                           v-model="item.relatedSection"
+                           :placeholder="$t('PleaseEnter')+$t('relevantSections')"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text"
+                        :title="$t('questionsSuggestions')">{{$t('questionsSuggestions')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="issueOrSuggest">
+                  <a-input class="box-input"
+                           :disabled="disabled"
+                           v-model="item.issueOrSuggest"
+                           :placeholder="$t('PleaseEnter')+$t('questionsSuggestions')"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('reason')">{{$t('reason')}}</span>
+                </div>
+                <a-form-model-item class="itemModel">
+                  <a-input class="box-input"
+                           :disabled="disabled"
+                           v-model="item.reason"
+                           :placeholder="$t('PleaseEnter')+$t('reason')"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="accessoryFile">
+                  <a-button type="primary" class="button-text"
+                            @click="clickButtonToUpload('accessoryFile',index)">
+                    {{ (item.accessoryFile === 'null' || item.accessoryFile === '' ||
+                    item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                    }}
+                  </a-button>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+        </div>
+      </a-form-model>
+    </div>
+    <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import uploadFile from '@/components/uploadFile/file'
+  export default {
+    name: 'evaluatorFeedback',
+    components: {
+      uploadFile
+    },
+    props: {
+      title: {
+        type: String,
+        default: ''
+      },
+      feedbackDataList:{
+        type: Array,
+        default: (()=>{
+          return []
+        })
+      },
+    },
+    data() {
+      return {
+        formInline: {},
+        disabled:false,
+        rules: {},
+        uploadIndex:'',
+        dataList: []
+      }
+    },
+    mounted() {
+      if (this.feedbackDataList && this.feedbackDataList.length > 0){
+        this.dataList = this.feedbackDataList
+        this.dataList = [...this.dataList]
+      }else{
+        this.dataList = [
+          {
+            relatedSection: '',
+            issueOrSuggest: '',
+            reason: '',
+            accessoryFile: ''
+          }
+        ]
+      }
+    },
+    methods: {
+      clickButtonToUpload(item,index) {
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+        this.uploadName = item
+        this.uploadIndex = index
+        getAction('sys/common/getFileInfos', { id: this.dataList[this.uploadIndex][this.uploadName] }).then((res) => {
+          if (res.success) {
+            this.$refs.uploadFile.perentHandleFunc(res.result)
+          } else {
+            this.$refs.uploadFile.perentHandleFunc()
+          }
+        })
+      },
+      /** 上传文件的回调 */
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push(item.id || data.name)
+          })
+        }
+        /** 赋值给当前对应的表单文件 */
+        this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
+        this.dataList = [...this.dataList]
+      },
+      addData() {
+        this.dataList.push({
+          relatedSection: '',
+          issueOrSuggest: '',
+          reason: '',
+          accessoryFile: ''
+        })
+        this.dataList = [...this.dataList]
+      },
+      deleteData() {
+        this.dataList.pop()
+        this.dataList = [...this.dataList]
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  .box {
+    padding: 0 24px 24px 24px;
+    box-sizing: border-box;
+  }
+
+  .box-text {
+    display: flex;
+    justify-content: space-between;
+    height: 60px;
+    line-height: 40px;
+
+    .header-text {
+      font-size: 16px;
+      font-weight: 400;
+      color: #000F16;
+    }
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 88px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 48px;
+    color: #000F16;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+    margin-bottom: 12px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .button-text {
+    height: 38px;
+    width: calc(100% - 100px);
+    line-height: 38px;
+    background: #fff;
+    border: 1px #00B3BE solid;
+    color: #00B3BE;
+  }
+
+  .feedbackPoint {
+    font-size: 14px;
+    font-weight: 400;
+    color: #000F16;
+    margin-bottom: 10px;
+  }
+
+  .icon-size {
+    font-size: 18px;
+    margin-left: 8px;
+    cursor: pointer;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
new file mode 100644
index 000000000..68383c0c4
--- /dev/null
+++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
@@ -0,0 +1,185 @@
+<template>
+  <div class="box">
+    <div class="box-text">
+      <div class="header-text">
+        {{title}}
+      </div>
+    </div>
+    <div class="content-text">
+
+    </div>
+    <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import uploadFile from '@/components/uploadFile/file'
+  export default {
+    name: 'evaluatorFeedback',
+    components: {
+      uploadFile
+    },
+    props: {
+      title: {
+        type: String,
+        default: ''
+      },
+      feedbackDataList:{
+        type: Array,
+        default: (()=>{
+          return []
+        })
+      },
+    },
+    data() {
+      return {
+        formInline: {},
+        disabled:false,
+        rules: {},
+        uploadIndex:'',
+        dataList: []
+      }
+    },
+    mounted() {
+      if (this.feedbackDataList && this.feedbackDataList.length > 0){
+        this.dataList = this.feedbackDataList
+        this.dataList = [...this.dataList]
+      }else{
+        this.dataList = [
+          {
+            relatedSection: '',
+            issueOrSuggest: '',
+            reason: '',
+            accessoryFile: ''
+          }
+        ]
+      }
+    },
+    methods: {
+      clickButtonToUpload(item,index) {
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+        this.uploadName = item
+        this.uploadIndex = index
+        getAction('sys/common/getFileInfos', { id: this.dataList[this.uploadIndex][this.uploadName] }).then((res) => {
+          if (res.success) {
+            this.$refs.uploadFile.perentHandleFunc(res.result)
+          } else {
+            this.$refs.uploadFile.perentHandleFunc()
+          }
+        })
+      },
+      /** 上传文件的回调 */
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push(item.id || data.name)
+          })
+        }
+        /** 赋值给当前对应的表单文件 */
+        this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
+        this.dataList = [...this.dataList]
+      },
+      addData() {
+        this.dataList.push({
+          relatedSection: '',
+          issueOrSuggest: '',
+          reason: '',
+          accessoryFile: ''
+        })
+        this.dataList = [...this.dataList]
+      },
+      deleteData() {
+        this.dataList.pop()
+        this.dataList = [...this.dataList]
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  .box {
+    padding: 0 24px 24px 24px;
+    box-sizing: border-box;
+  }
+
+  .box-text {
+    display: flex;
+    justify-content: space-between;
+    height: 60px;
+    line-height: 40px;
+
+    .header-text {
+      font-size: 16px;
+      font-weight: 400;
+      color: #000F16;
+    }
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 88px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 48px;
+    color: #000F16;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+    margin-bottom: 12px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .button-text {
+    height: 38px;
+    width: calc(100% - 100px);
+    line-height: 38px;
+    background: #fff;
+    border: 1px #00B3BE solid;
+    color: #00B3BE;
+  }
+
+  .feedbackPoint {
+    font-size: 14px;
+    font-weight: 400;
+    color: #000F16;
+    margin-bottom: 10px;
+  }
+
+  .icon-size {
+    font-size: 18px;
+    margin-left: 8px;
+    cursor: pointer;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
index 94ec268cf..810c536e3 100644
--- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
@@ -12,11 +12,11 @@
           :url="url"
           :standardContentQuery="queryProject"
         />
-        <feedbackInformation
+        <evaluatorFeedback
           v-if="isDisplay"
           ref="feedbackInformationRef"
           :feedbackDataList="feedbackDataList"
-          :title="$t('feedbackInformation')"
+          :title="$t('evaluatorFeedback')"
         />
         <footerProcess
           v-if="isDisplay"
@@ -37,7 +37,7 @@
   import standardContent from '../../components/standardContent'
   import circulationHistory from '../../components/regulatoryCirculationHistory'
   import footerProcess from '../../components/footerProcess'
-  import feedbackInformation from '../../components/feedbackInformation'
+  import evaluatorFeedback from '../../components/evaluatorFeedback'
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
   import moment from 'moment'
   import { mapGetters } from 'vuex'
@@ -48,7 +48,7 @@
       standardContent,
       circulationHistory,
       footerProcess,
-      feedbackInformation
+      evaluatorFeedback
     },
     data() {
 
@@ -80,14 +80,17 @@
             value: 'endTime'
           },
           {
-            title: this.$t('enclosure'),
-            value: 'accessory_id',
+            title: this.$t('evaluationMethod'),
+            value: 'evaluationMethod',
+          },
+          {
+            title: this.$t('RelevantMaterials'),
+            value: 'RelevantMaterials',
             type: 2
           },
-          {},
           {
-            title: this.$t('taskDescription'),
-            value: 'taskExplain'
+            title: this.$t('processBackground'),
+            value: 'processBackground'
           }
           // {
           //   title: this.$t('remarks'),
@@ -97,10 +100,10 @@
       }
     },
     mounted() {
-      this.isDisplay = false
-      this.queryTaskDetailByTask(() => {
-        this.lawsOpinionAssessmentResult()
-      })
+      this.isDisplay = true
+      // this.queryTaskDetailByTask(() => {
+      //   this.lawsOpinionAssessmentResult()
+      // })
     },
     methods: {
       ...mapGetters(['userInfo']),

From 6c8bb8ba72b8169082f1a82d9d7d5593163ab82e Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Tue, 12 Jul 2022 10:52:55 +0800
Subject: [PATCH 012/103] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8F=82=E6=95=B0=E9=A1=B9-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsReportDetailEOController.java       | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java
index 8d3e9f61e..a3cd6327c 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java
@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
+import com.jero.modules.cert.report.entity.ParamsReportConfigEO;
 import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
+import com.jero.modules.cert.report.service.IParamsReportConfigEOService;
 import com.jero.modules.cert.report.service.IParamsReportDetailEOService;
 import com.jero.modules.cert.report.vo.ParamsReportDetailVO;
 import io.swagger.annotations.Api;
@@ -38,6 +40,9 @@ public class ParamsReportDetailEOController extends JeroController<ParamsReportD
 	@Autowired
 	private IParamsReportDetailEOService paramsReportDetailEOService;
 
+	@Autowired
+	private IParamsReportConfigEOService paramsReportConfigEOService;
+
 	/**
 	 * 表头中英文切换
 	 *
@@ -148,4 +153,27 @@ public class ParamsReportDetailEOController extends JeroController<ParamsReportD
 		paramsReportDetailEOService.exportCustom(paramsReportDetailVO, response, request);
 	}
 
+//	@ApiOperation(value = "上报库参数项-自定义导出excel")
+//	@GetMapping(value = "/exportCustomExcel")
+////	@RequiresPermissions("report:detail:export:custom")
+//	public void exportCustomExcel(ParamsReportDetailVO paramsReportDetailVO,
+//								   HttpServletResponse response,
+//								   HttpServletRequest request) {
+//		paramsReportDetailEOService.exportCustomExcel(paramsReportDetailVO, response, request);
+//	}
+
+	/**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "上报库参数配置-查看单个详情")
+	@ApiOperation(value="上报库参数配置-查看单个详情", notes="上报库参数配置-查看单个详情")
+	@GetMapping(value = "/getConfig")
+//	 @RequiresPermissions("report:detail:list")
+	public Result<ParamsReportConfigEO> getById(@RequestParam(name = "id") String id) {
+		ParamsReportConfigEO paramsReportConfigEO = paramsReportConfigEOService.getById(id);
+		return Result.OK(paramsReportConfigEO);
+	}
+
 }

From 772a314b3a56ca4747b30610aa40f52b67c77a6e Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 12 Jul 2022 11:01:43 +0800
Subject: [PATCH 013/103] =?UTF-8?q?=E5=B8=83=E5=B1=80=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

---
 jero-web/src/common/lang/en-us.js             |   3 +
 jero-web/src/common/lang/zh-cn.js             |   3 +
 .../components/modules/defaultTemplate.vue    |  46 +++++---
 .../components/modules/fillAdd.vue            |  11 ++
 .../components/evaluatorFeedback.vue          |  17 +--
 .../components/evaluatorFeedbackList.vue      | 104 ++++++++++++------
 .../processForm/evaluationProcess/index.vue   |  12 +-
 7 files changed, 126 insertions(+), 70 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 5390bad63..05586dcd0 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1114,4 +1114,7 @@ module.exports = {
   pleaseSelectStandardFirst:'Please select a standard first',
   RelevantMaterials:'RelevantMaterials',
   evaluatorFeedback:'Evaluator feedback',
+  nameTechnicalDocument:'Name of technical document',
+  chapter:'chapter',
+  problemDescription:'Problem description',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index e7216f749..700a6135c 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1118,4 +1118,7 @@ module.exports = {
   standardDecompositionDocument:'带入标准分解单',
   pleaseSelectStandardFirst:'请先选择标准',
   evaluatorFeedback:'评估人反馈',
+  nameTechnicalDocument:'技术文件名称',
+  chapter:'章节',
+  problemDescription:'问题说明',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
index cdd5dd3a4..61e2611e2 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
@@ -135,20 +135,20 @@
       </a-col>
     </a-row>
     <a-row :gutter="24">
-      <a-col :span="12">
-        <div class="box-title-text">
-          <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('releaseDate')">{{$t('releaseDate')}}</span>
-          </div>
-          <a-form-model-item class="itemModel" prop="issueTime">
-            <a-input class="box-input"
-                     :disabled="disabled"
-                     v-model="formInline.issueTime"
-                     :placeholder="$t('PleaseEnter')+$t('releaseDate')"/>
-          </a-form-model-item>
-        </div>
-      </a-col>
+      <!--      <a-col :span="12">-->
+      <!--        <div class="box-title-text">-->
+      <!--          <div class="title-text">-->
+      <!--                <span class="title-text-text"-->
+      <!--                      :title="$t('releaseDate')">{{$t('releaseDate')}}</span>-->
+      <!--          </div>-->
+      <!--          <a-form-model-item class="itemModel" prop="issueTime">-->
+      <!--            <a-input class="box-input"-->
+      <!--                     :disabled="disabled"-->
+      <!--                     v-model="formInline.issueTime"-->
+      <!--                     :placeholder="$t('PleaseEnter')+$t('releaseDate')"/>-->
+      <!--          </a-form-model-item>-->
+      <!--        </div>-->
+      <!--      </a-col>-->
       <a-col :span="12">
         <div class="box-title-text">
           <div class="title-text">
@@ -163,8 +163,6 @@
           </a-form-model-item>
         </div>
       </a-col>
-    </a-row>
-    <a-row :gutter="24">
       <a-col :span="12">
         <div class="box-title-text">
           <div class="title-text">
@@ -180,6 +178,9 @@
         </div>
       </a-col>
     </a-row>
+    <!--    <a-row :gutter="24">-->
+
+    <!--    </a-row>-->
     <a-row :gutter="24">
       <a-col :span="24">
         <div class="box-title-text">
@@ -391,8 +392,21 @@
     methods: {
       ...mapGetters(['userInfo']),
       getStandData(value) {
+        console.log(value)
         this.formInline.titleCn = value.serial_number + ' ' + value.title
         this.formInline.titleEn = value.serial_number + ' ' + value.title_en
+        this.formInline.technologyTerritory = value.technology_territory_dict
+        this.formInline.applyCar = value.shi4_yong4_che1_xing2_dict
+        this.formInline.applyScope = value.shi4_yong4_fan4_wei2_dict
+        this.formInline.state = value.state_dict
+        this.formInline.newCarImplementTime = value.xin1_che1_xing2_shi2_shi1_ri4_qi1
+        this.formInline.productionCarImplementTime = value.implement_time
+        var curPath = window.document.location.href
+        var pathname = window.document.location.pathname
+        var pos = curPath.indexOf(pathname)
+        var localhostPath = curPath.substring(0, pos)
+        this.formInline.link = localhostPath + '/docManage/library/detail?id=' + value.id
+        this.formInline = {...this.formInline}
       },
       getSysCategoryTree() {
         getAction('/sys/category/getSysCategoryTree', {}).then((res) => {
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
index 22f173f08..ca2803ca7 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
@@ -50,6 +50,7 @@
                     v-model="formInline.memoriesChapter"
                     :maxTagCount="1"
                     :disabled="disabled"
+                    @change="changeTree"
                     :getPopupContainer="triggerNode=> triggerNode.parentNode"
                     class="box-input"
                     style="width: 100%"
@@ -187,6 +188,9 @@
         getAction('/report/lawsMonthlyReportTitleTemplateEO/list', {}).then((res) => {
           if (res.success) {
             this.chapterContentsList = res.result || []
+            this.chapterContentsList.forEach(val => {
+              val.disabled = true
+            })
           } else {
             this.chapterContentsList = []
           }
@@ -245,6 +249,13 @@
       handleCancel() {
         this.visible = false
       },
+      changeTree(value, node, extra) {
+        if (value.length > 1) {
+          value.shift()
+        }
+        this.formInline.memoriesChapter = value
+        this.formInline = { ...this.formInline }
+      },
       handleSubmit() {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
index 3d5cfad06..5492cf511 100644
--- a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
+++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
@@ -59,31 +59,18 @@
                 <div class="title-text">
                   <span class="Required">*</span>
                   <span class="title-text-text"
-                        :title="$t('questionsSuggestions')">{{$t('questionsSuggestions')}}</span>
+                        :title="$t('problemDescription')">{{$t('problemDescription')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="issueOrSuggest">
                   <a-input class="box-input"
                            :disabled="disabled"
                            v-model="item.issueOrSuggest"
-                           :placeholder="$t('PleaseEnter')+$t('questionsSuggestions')"/>
+                           :placeholder="$t('PleaseEnter')+$t('problemDescription')"/>
                 </a-form-model-item>
               </div>
             </a-col>
           </a-row>
           <a-row :gutter="24">
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="title-text-text" :title="$t('reason')">{{$t('reason')}}</span>
-                </div>
-                <a-form-model-item class="itemModel">
-                  <a-input class="box-input"
-                           :disabled="disabled"
-                           v-model="item.reason"
-                           :placeholder="$t('PleaseEnter')+$t('reason')"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
index 68383c0c4..1711ad4fe 100644
--- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
+++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
@@ -6,7 +6,15 @@
       </div>
     </div>
     <div class="content-text">
-
+      <a-table
+        ref="table"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%'}"
+        :data-source="dataSource"
+        :columns="columns"
+      >
+      </a-table>
     </div>
     <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
   </div>
@@ -25,36 +33,73 @@
         type: String,
         default: ''
       },
-      feedbackDataList:{
-        type: Array,
-        default: (()=>{
-          return []
-        })
-      },
     },
     data() {
       return {
-        formInline: {},
         disabled:false,
-        rules: {},
+        loading:false,
         uploadIndex:'',
-        dataList: []
+        dataSource:[],
+        columns:[
+          {
+            title: this.$t('clauseNo'),
+            dataIndex: 'items_num',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseName'),
+            dataIndex: 'items_name',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseContent'),
+            dataIndex: 'iterms_conditions',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('evaluationMethod'),
+            dataIndex: 'evaluationMethod',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('nameTechnicalDocument'),
+            dataIndex: 'nameTechnicalDocument',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('chapter'),
+            dataIndex: 'chapter',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('opinion'),
+            dataIndex: 'opinion',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('enclosure'),
+            dataIndex: 'enclosure',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('complianceResults'),
+            dataIndex: 'complianceResults',
+            align: 'center',
+            ellipsis: true
+          },
+        ],
       }
     },
     mounted() {
-      if (this.feedbackDataList && this.feedbackDataList.length > 0){
-        this.dataList = this.feedbackDataList
-        this.dataList = [...this.dataList]
-      }else{
-        this.dataList = [
-          {
-            relatedSection: '',
-            issueOrSuggest: '',
-            reason: '',
-            accessoryFile: ''
-          }
-        ]
-      }
+
     },
     methods: {
       clickButtonToUpload(item,index) {
@@ -82,19 +127,6 @@
         this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
         this.dataList = [...this.dataList]
       },
-      addData() {
-        this.dataList.push({
-          relatedSection: '',
-          issueOrSuggest: '',
-          reason: '',
-          accessoryFile: ''
-        })
-        this.dataList = [...this.dataList]
-      },
-      deleteData() {
-        this.dataList.pop()
-        this.dataList = [...this.dataList]
-      }
     }
   }
 </script>
diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
index 810c536e3..f438e9690 100644
--- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
@@ -14,10 +14,15 @@
         />
         <evaluatorFeedback
           v-if="isDisplay"
-          ref="feedbackInformationRef"
+          ref="evaluatorFeedbackRef"
           :feedbackDataList="feedbackDataList"
           :title="$t('evaluatorFeedback')"
         />
+        <evaluatorFeedbackList
+          v-if="isDisplay"
+          ref="evaluatorFeedbackListRef"
+          :title="$t('evaluatorFeedback')"
+        />
         <footerProcess
           v-if="isDisplay"
           isPreservation
@@ -38,6 +43,7 @@
   import circulationHistory from '../../components/regulatoryCirculationHistory'
   import footerProcess from '../../components/footerProcess'
   import evaluatorFeedback from '../../components/evaluatorFeedback'
+  import evaluatorFeedbackList from '../../components/evaluatorFeedbackList'
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
   import moment from 'moment'
   import { mapGetters } from 'vuex'
@@ -48,10 +54,10 @@
       standardContent,
       circulationHistory,
       footerProcess,
-      evaluatorFeedback
+      evaluatorFeedback,
+      evaluatorFeedbackList
     },
     data() {
-
       return {
         title: this.$t('collectionOfRegulatoryOpinions'),
         url: {

From 3fb138e2dcd09fdff3933d3e1d71096852fa6147 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 12 Jul 2022 11:41:59 +0800
Subject: [PATCH 014/103] =?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/api/manage.js                                    | 4 ++++
 jero-web/src/views/dashboard/components/myList.vue            | 4 ++--
 .../processList/tabComponents/processCenter/index.vue         | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/api/manage.js b/jero-web/src/api/manage.js
index 349700e7a..eebd43e55 100644
--- a/jero-web/src/api/manage.js
+++ b/jero-web/src/api/manage.js
@@ -195,6 +195,10 @@ export function downloadFile(url, fileName, parameter, callback) {
         }
       } catch (e) {
         if (!data || data.size === 0) {
+          index.showDrawer({
+            loading: false,
+            isTrue: isTrue
+          })
           Vue.prototype['$message'].warning('文件下载失败')
           return
         }
diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue
index 82e3f7663..3f1f4e533 100644
--- a/jero-web/src/views/dashboard/components/myList.vue
+++ b/jero-web/src/views/dashboard/components/myList.vue
@@ -86,8 +86,8 @@
         })
       },
       prcClick(row) {
-        let index = row.taskIds.lastIndexOf(',')
-        row.taskIds = row.taskIds.slice(0, index)
+        // let index = row.taskIds.lastIndexOf(',')
+        // row.taskIds = row.taskIds.slice(0, index)
         if (row.prcType == '1') {
           let newUrl = this.$router.resolve({
             path: '/handshakeProcess',
diff --git a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
index e3981099f..ce1eaeec0 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
@@ -154,8 +154,8 @@
         })
       },
       dealWith(row) {
-        let index = row.taskIds.lastIndexOf(',')
-        row.taskIds = row.taskIds.slice(0, index)
+        // let index = row.taskIds.lastIndexOf(',')
+        // row.taskIds = row.taskIds.slice(0, index)
         if (row.prcType == '1') {
           let newUrl = this.$router.resolve({
             path: '/handshakeProcess',

From 32dbf7486f29f0f004bf30dbc6e2745c746e8ad4 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Tue, 12 Jul 2022 11:57:13 +0800
Subject: [PATCH 015/103] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=93-=E8=A7=A3=E5=86=B3=E5=8E=86=E5=8F=B2=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E4=B8=8B=E8=BD=BD=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/service/impl/ParamsReportDetailEOServiceImpl.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
index ae409e6dc..629c3eebd 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
@@ -588,7 +588,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 
 			// 添加导出历史
 			String uploadFileName = fileOriName + ".zip";
-			MultipartFile mFile = new MockMultipartFile(uploadFileName, uploadFileName, ContentType.APPLICATION_OCTET_STREAM.toString(), fis); // 用于上传
+			InputStream uploadFileio = new FileInputStream(new File(fileNowPath+".zip"));
+			MultipartFile mFile = new MockMultipartFile(uploadFileName, uploadFileName, "text/plain", uploadFileio); // 用于上传
 			OSSFile ossFile = ossFileService.uploadLocalOfCos(mFile, "/report", "", CutEnum.CN.getValue()); // 上传导出的压缩包
 			ParamsReportExportHistoryEO paramsReportExportHistoryEO = new ParamsReportExportHistoryEO();
 			paramsReportExportHistoryEO.setExportType(ExportTypeEnum.NORMAL.getValue());
@@ -597,6 +598,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 			paramsReportExportHistoryEO.setExportTime(new Date());
 			paramsReportExportHistoryEOService.add(paramsReportExportHistoryEO);
 
+			uploadFileio.close();
 			os.flush();
 			os.close(); // 后开先关
 			fis.close(); // 先开后关

From 3acf90d33e4226675b6385c3d966fc1352a7d677 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Tue, 12 Jul 2022 13:44:32 +0800
Subject: [PATCH 016/103] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9-=E5=8F=98=E6=9B=B4:=E5=8E=BB=E6=8E=89=E6=8A=80?=
 =?UTF-8?q?=E6=9C=AF=E9=A2=86=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cert/template/entity/ParamsInfoEO.java    |  4 +--
 .../service/impl/ParamsInfoEOServiceImpl.java | 32 +++++++++----------
 .../cert/template/vo/ParamsInfoCnImport.java  |  2 +-
 .../cert/template/vo/ParamsInfoEnExport.java  |  4 +--
 .../cert/template/vo/ParamsInfoEnImport.java  |  2 +-
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java
index bac0f3502..548885b9d 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java
@@ -77,10 +77,10 @@ public class ParamsInfoEO implements Serializable {
     private String paramsName;
 
 	/**技术领域*/
-	@Excel(name = "*技术领域", width = 15)
+//	@Excel(name = "*技术领域", width = 15)
 //    @Dict(dicCode = "technology_territory")
     @ApiModelProperty(value = "技术领域")
-    private String technologyTerritory;
+    private String technologyTerritory; // 2022-07-12 需求去掉技术领域
 
 	/**参数批次*/
 	@Excel(name = "*参数批次", width = 15, dicCode = "params_batch")
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
index ad9bf75f1..0c2e0f47a 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
@@ -455,7 +455,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 			if (CutEnum.CN.getValue().equals(cut)) {
 				// 查询导出数据
 				List<ParamsInfoEO> paramsInfoEOList = paramsInfoEOMapper.selectListWithCert(paramsInfoVO); // 中文数据导出
-				getTreeDictItemText(paramsInfoEOList, cut);
+//				getTreeDictItemText(paramsInfoEOList, cut);
 				List<Map<String, Object>> sheetsList = new ArrayList<>();
 				sheetsList = getCnExportSheetsList(paramsInfoEOList, fileNowPath, paramsTemplateId);
 				workbook = ExcelExportUtil.exportExcel(sheetsList, ExcelType.XSSF);
@@ -463,7 +463,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 			} else if (CutEnum.EN.getValue().equals(cut)) {
 				// 查询导出数据
 				List<ParamsInfoEnExport> paramsInfoEnExportList = paramsInfoEOMapper.selectListWithCertForEnExport(paramsInfoVO); // 英文数据导出
-				getTreeDictItemTextForEnExport(paramsInfoEnExportList);
+//				getTreeDictItemTextForEnExport(paramsInfoEnExportList);
 				List<Map<String, Object>> sheetsList = new ArrayList<>();
 				sheetsList = getEnExportSheetsList(paramsInfoEnExportList, fileNowPath, paramsTemplateId);
 				workbook = ExcelExportUtil.exportExcel(sheetsList, ExcelType.XSSF);
@@ -839,7 +839,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 					// 第几个sheet页
 					if (numSheet == 0) { // 企业参数表
 						if (CutEnum.EN.getValue().equals(cut)) {
-							String fields[] ={ "*NIO Number", "*Is Must", "*Params Name","*Technical Field","*Params Batch","*Duty Territory",
+							String fields[] ={ "*NIO Number", "*Is Must", "*Params Name","*Params Batch","*Duty Territory",
 									"Description", "*Control Type", "Control Verify", "Control Values", "File Template"};
 							params.setImportFields(fields);
 
@@ -847,7 +847,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 							List<ParamsInfoEnImport> paramsInfoEOListEn = resultEn.getList();
 							copyParamsInfoList(paramsInfoEOListEn, paramsInfoEOList);
 						} else {
-							String fields[] ={ "*NIO编号", "*是否必填", "*参数名称","*技术领域","*参数批次","*责任领域",
+							String fields[] ={ "*NIO编号", "*是否必填", "*参数名称","*参数批次","*责任领域",
 									"参数说明", "*控件类型", "控件校验", "控件备选值", "附件模板"};
 							params.setImportFields(fields);
 
@@ -1069,7 +1069,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 									String cut){
 		List<CertCategoryParamsInfoCnImport> certCategoryParamsInfoEOList = new ArrayList<>();
 		// 树形数据字典
-		List<SysCategory> categoryList = sysCategoryService.queryByTreeDicCode("technology_territory");
+//		List<SysCategory> categoryList = sysCategoryService.queryByTreeDicCode("technology_territory");
 		// 普通数据字典
 		List<SysDictItem> dictItemList = new ArrayList<>();
 		List<String> dictCodeList = new ArrayList<>();
@@ -1091,12 +1091,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 		//普通数据字典
 		List<String> itemNameList = new ArrayList<>();
 		if (CutEnum.CN.getValue().equals(cut)) {
-			treeNameList = categoryList.stream().map(SysCategory::getName).collect(Collectors.toList());
+//			treeNameList = categoryList.stream().map(SysCategory::getName).collect(Collectors.toList());
 			itemNameList = dictItemList.stream().map(SysDictItem::getItemText).collect(Collectors.toList());
 
 			certCategoryMap = dictItemList.stream().filter(e->"cert_category".equals(e.getDictCode())).collect(Collectors.toMap(c->c.getItemText(),c->c.getItemValue()));
 		} else if(CutEnum.EN.getValue().equals(cut)){
-			treeNameList = categoryList.stream().map(SysCategory::getEnName).collect(Collectors.toList());
+//			treeNameList = categoryList.stream().map(SysCategory::getEnName).collect(Collectors.toList());
 			itemNameList = dictItemList.stream().map(SysDictItem::getEnName).collect(Collectors.toList());
 
 			certCategoryMap = dictItemList.stream().filter(e->"cert_category".equals(e.getDictCode())).collect(Collectors.toMap(c->c.getEnName(),c->c.getItemValue()));
@@ -1177,15 +1177,15 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 			countError += (int)resultMap.get("countError");
 
 			// 技术领域
-			String technologyTerritory =  dto.getTechnologyTerritory();
-			resultMap = validateMustAndLength(technologyTerritory, "技术领域", "Technical Field", IsMustEnum.YES.getValue(), "1000", false, cut);
-			errorMsg += (String)resultMap.get("errorMsg");
-			countError += (int)resultMap.get("countError");
-			resultMap = getCodeByName(technologyTerritory,"技术领域", "Technical Field","treeDicCode",null,treeNameList,categoryList,cut);
-			errorMsg += (String)resultMap.get("errorMsg");
-			countError += (int)resultMap.get("countError");
-			technologyTerritory = (String)resultMap.get("value");
-			dto.setTechnologyTerritory(technologyTerritory);
+//			String technologyTerritory =  dto.getTechnologyTerritory();
+//			resultMap = validateMustAndLength(technologyTerritory, "技术领域", "Technical Field", IsMustEnum.YES.getValue(), "1000", false, cut);
+//			errorMsg += (String)resultMap.get("errorMsg");
+//			countError += (int)resultMap.get("countError");
+//			resultMap = getCodeByName(technologyTerritory,"技术领域", "Technical Field","treeDicCode",null,treeNameList,categoryList,cut);
+//			errorMsg += (String)resultMap.get("errorMsg");
+//			countError += (int)resultMap.get("countError");
+//			technologyTerritory = (String)resultMap.get("value");
+//			dto.setTechnologyTerritory(technologyTerritory);
 
 			// 参数批次
 			String paramsBatch = dto.getParamsBatch();
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java
index ffebdcb74..d8624da4c 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java
@@ -28,7 +28,7 @@ public class ParamsInfoCnImport {
     private String paramsName;
 
     /**技术领域*/
-    @Excel(name = "*技术领域", width = 15)
+//    @Excel(name = "*技术领域", width = 15)
     @ApiModelProperty(value = "技术领域")
     private String technologyTerritory;
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java
index 6a9163656..2e212bda7 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java
@@ -60,8 +60,8 @@ public class ParamsInfoEnExport {
     private String paramsName;
 
     /**技术领域*/
-    @Excel(name = "*Technical Field", width = 15)
-//    @Dict(dicCode = "technology_territory")
+//    @Excel(name = "*Technical Field", width = 15)
+////    @Dict(dicCode = "technology_territory")
     @ApiModelProperty(value = "技术领域")
     private String technologyTerritory;
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java
index f2ae3c61e..982494a01 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java
@@ -28,7 +28,7 @@ public class ParamsInfoEnImport {
     private String paramsName;
 
     /**技术领域*/
-    @Excel(name = "*Technical Field", width = 15)
+//    @Excel(name = "*Technical Field", width = 15)
     @ApiModelProperty(value = "技术领域")
     private String technologyTerritory;
 

From 060be76901ef59173bfc404f88d325174c33bd0d Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 12 Jul 2022 14:19:22 +0800
Subject: [PATCH 017/103] =?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

---
 .../components/evaluationResultsList.vue      |  12 +-
 .../components/evaluatorFeedback.vue          | 115 +++++++++++++-----
 .../components/feedbackInformation.vue        |  75 +++++++-----
 .../processForm/evaluationProcess/index.vue   |   5 +-
 .../processForm/regulatoryProcess/index.vue   |   4 +-
 5 files changed, 138 insertions(+), 73 deletions(-)

diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
index fb1d93dfa..a474a8892 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
@@ -177,11 +177,13 @@
       //导出
       handleExport() {
         let query = {
-          lawsOpinionGatherId: this.lawsOpinionGatherId,
-          actiProcInstId: this.actiProcInstId
+          pageSize:this.pageSize,
+          pageNo:this.pageNo
+          // lawsOpinionGatherId: this.lawsOpinionGatherId,
+          // actiProcInstId: this.actiProcInstId
         }
         downloadFile('/lawsOpinionGather/lawsOpinionAssessmentResultEO/exportXls',
-          this.$t('evaluationResults') + '.xls', query)
+          this.$t('evaluationResults') + '.zip', query)
       },
       getData(row) {
         this.visible = true
@@ -206,7 +208,9 @@
       getList() {
         let query = {
           lawsOpinionGatherId: this.lawsOpinionGatherId,
-          actiProcInstId: this.actiProcInstId
+          actiProcInstId: this.actiProcInstId,
+          pageSize:this.pageSize,
+          pageNo:this.pageNo
         }
         this.loading = true
         getAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/page', query).then((res) => {
diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
index 5492cf511..a9b0fcefe 100644
--- a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
+++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
@@ -27,16 +27,16 @@
             </div>
           </a-col>
         </a-row>
-        <div v-for="(item,index) in dataList" :key="index">
+        <div v-for="(item,index) in formInline.dataList" :key="index">
           <div class="feedbackPoint">
             {{$t('feedbackPoint')+(index+1)}}
             <a-icon class="icon-size"
                     @click="addData"
-                    v-if="(dataList.length-1) == index"
+                    v-if="(formInline.dataList.length-1) == index"
                     type="plus-circle"/>
             <a-icon class="icon-size"
                     @click="deleteData"
-                    v-if="dataList.length > 1 && (dataList.length - 1) == index"
+                    v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index"
                     type="minus-circle"/>
           </div>
           <a-row :gutter="24">
@@ -46,7 +46,11 @@
                   <span class="Required">*</span>
                   <span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="relatedSection">
+                <a-form-model-item class="itemModel"
+                                   :prop="'dataList.'+index+'.relatedSection'"
+                                   :rules="[{ required: true, message: $t('relevantSections') + $t('cannotEmpty'), trigger: 'blur'},
+                                   {max: 300,message: $t('relevantSections') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
+                                    }]">
                   <a-input class="box-input"
                            :disabled="disabled"
                            v-model="item.relatedSection"
@@ -61,7 +65,10 @@
                   <span class="title-text-text"
                         :title="$t('problemDescription')">{{$t('problemDescription')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="issueOrSuggest">
+                <a-form-model-item class="itemModel" :prop="'dataList.'+index+'.issueOrSuggest'"
+                                   :rules="[{ required: true, message: $t('problemDescription') + $t('cannotEmpty'), trigger: 'blur'},
+                                   {max: 300,message: $t('problemDescription') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
+                                    }]">
                   <a-input class="box-input"
                            :disabled="disabled"
                            v-model="item.issueOrSuggest"
@@ -97,6 +104,7 @@
 <script>
   import { getAction, postAction } from '@/api/manage'
   import uploadFile from '@/components/uploadFile/file'
+
   export default {
     name: 'evaluatorFeedback',
     components: {
@@ -107,44 +115,78 @@
         type: String,
         default: ''
       },
-      feedbackDataList:{
+      feedbackDataList: {
         type: Array,
-        default: (()=>{
+        default: (() => {
           return []
         })
-      },
+      }
     },
     data() {
       return {
         formInline: {},
-        disabled:false,
-        rules: {},
-        uploadIndex:'',
+        disabled: false,
+        rules: {
+          flag:[
+            {
+              required: true,
+              message: this.$t('complianceResults') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            },
+          ],
+          relatedSection: [
+            {
+              required: true,
+              message: this.$t('relevantSections') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
+            {
+              max: 300,
+              message: this.$t('relevantSections') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          issueOrSuggest: [
+            {
+              required: true,
+              message: this.$t('problemDescription') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
+            {
+              max: 300,
+              message: this.$t('problemDescription') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ]
+        },
+        uploadIndex: '',
         dataList: []
       }
     },
     mounted() {
-      if (this.feedbackDataList && this.feedbackDataList.length > 0){
-        this.dataList = this.feedbackDataList
-        this.dataList = [...this.dataList]
-      }else{
-        this.dataList = [
-          {
-            relatedSection: '',
-            issueOrSuggest: '',
-            reason: '',
-            accessoryFile: ''
-          }
-        ]
-      }
+      this.$nextTick(() => {
+        if (this.feedbackDataList && this.feedbackDataList.length > 0) {
+          this.formInline.dataList = this.feedbackDataList
+        } else {
+          this.formInline.dataList = [
+            {
+              relatedSection: '',
+              issueOrSuggest: '',
+              reason: '',
+              accessoryFile: ''
+            }
+          ]
+        }
+        this.formInline = { ...this.formInline }
+      })
     },
     methods: {
-      clickButtonToUpload(item,index) {
+      clickButtonToUpload(item, index) {
         this.$refs.uploadFile.perentHandleFunc()
         this.$refs.uploadFile.visible = true
         this.uploadName = item
         this.uploadIndex = index
-        getAction('sys/common/getFileInfos', { id: this.dataList[this.uploadIndex][this.uploadName] }).then((res) => {
+        getAction('sys/common/getFileInfos', { id: this.formInline.dataList[this.uploadIndex][this.uploadName] }).then((res) => {
           if (res.success) {
             this.$refs.uploadFile.perentHandleFunc(res.result)
           } else {
@@ -161,22 +203,29 @@
           })
         }
         /** 赋值给当前对应的表单文件 */
-        this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
-        this.dataList = [...this.dataList]
+        this.formInline.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
+        this.formInline = [...this.formInline]
       },
       addData() {
-        this.dataList.push({
+        this.formInline.dataList.push({
           relatedSection: '',
           issueOrSuggest: '',
           reason: '',
           accessoryFile: ''
         })
-        this.dataList = [...this.dataList]
+        this.formInline = [...this.formInline]
       },
       deleteData() {
-        this.dataList.pop()
-        this.dataList = [...this.dataList]
-      }
+        this.formInline.dataList.pop()
+        this.formInline = [...this.formInline]
+      },
+      submitData(callBack){
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            callBack && callBack(this.formInline)
+          }
+        })
+      },
     }
   }
 </script>
diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue
index 2eb3fd2ce..31a6c837d 100644
--- a/jero-web/src/views/processCenter/components/feedbackInformation.vue
+++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue
@@ -7,16 +7,16 @@
     </div>
     <div class="content-text">
       <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
-        <div v-for="(item,index) in dataList" :key="index">
+        <div v-for="(item,index) in formInline.dataList" :key="index">
           <div class="feedbackPoint">
             {{$t('feedbackPoint')+(index+1)}}
             <a-icon class="icon-size"
                     @click="addData"
-                    v-if="(dataList.length-1) == index"
+                    v-if="(formInline.dataList.length-1) == index"
                     type="plus-circle"/>
             <a-icon class="icon-size"
                     @click="deleteData"
-                    v-if="dataList.length > 1 && (dataList.length - 1) == index"
+                    v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index"
                     type="minus-circle"/>
           </div>
           <a-row :gutter="24">
@@ -26,7 +26,11 @@
                   <span class="Required">*</span>
                   <span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="relatedSection">
+                <a-form-model-item class="itemModel"
+                                   :prop="'dataList.'+index+'.relatedSection'"
+                                   :rules="[{ required: true, message: $t('relevantSections') + $t('cannotEmpty'), trigger: 'blur'},
+                                   {max: 300,message: $t('relevantSections') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
+                                    }]">
                   <a-input class="box-input"
                            :disabled="disabled"
                            v-model="item.relatedSection"
@@ -41,7 +45,10 @@
                   <span class="title-text-text"
                         :title="$t('questionsSuggestions')">{{$t('questionsSuggestions')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="issueOrSuggest">
+                <a-form-model-item class="itemModel" :prop="'dataList.'+index+'.issueOrSuggest'"
+                                   :rules="[{ required: true, message: $t('questionsSuggestions') + $t('cannotEmpty'), trigger: 'blur'},
+                                   {max: 300,message: $t('questionsSuggestions') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
+                                    }]">
                   <a-input class="box-input"
                            :disabled="disabled"
                            v-model="item.issueOrSuggest"
@@ -101,44 +108,48 @@
         type: String,
         default: ''
       },
-      feedbackDataList:{
+      feedbackDataList: {
         type: Array,
-        default: (()=>{
-           return []
+        default: (() => {
+          return []
         })
-      },
+      }
     },
     data() {
       return {
         formInline: {},
-        disabled:false,
+        disabled: false,
         rules: {},
-        uploadIndex:'',
+        uploadIndex: '',
         dataList: []
       }
     },
     mounted() {
-       if (this.feedbackDataList && this.feedbackDataList.length > 0){
-         this.dataList = this.feedbackDataList
-         this.dataList = [...this.dataList]
-       }else{
-         this.dataList = [
-           {
-             relatedSection: '',
-             issueOrSuggest: '',
-             reason: '',
-             accessoryFile: ''
-           }
-         ]
-       }
+      this.$nextTick(() => {
+        if (this.feedbackDataList && this.feedbackDataList.length > 0) {
+          this.formInline.dataList = this.feedbackDataList
+          this.formInline = { ...this.formInline }
+        } else {
+          this.formInline.dataList = [
+            {
+              relatedSection: '',
+              issueOrSuggest: '',
+              reason: '',
+              accessoryFile: ''
+            }
+          ]
+        }
+        this.formInline = { ...this.formInline }
+      })
+
     },
     methods: {
-      clickButtonToUpload(item,index) {
+      clickButtonToUpload(item, index) {
         this.$refs.uploadFile.perentHandleFunc()
         this.$refs.uploadFile.visible = true
         this.uploadName = item
         this.uploadIndex = index
-        getAction('sys/common/getFileInfos', { id: this.dataList[this.uploadIndex][this.uploadName] }).then((res) => {
+        getAction('sys/common/getFileInfos', { id: this.formInline.dataList[this.uploadIndex][this.uploadName] }).then((res) => {
           if (res.success) {
             this.$refs.uploadFile.perentHandleFunc(res.result)
           } else {
@@ -155,21 +166,21 @@
           })
         }
         /** 赋值给当前对应的表单文件 */
-        this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
-        this.dataList = [...this.dataList]
+        this.formInline.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
+        this.formInline = { ...this.formInline }
       },
       addData() {
-        this.dataList.push({
+        this.formInline.dataList.push({
           relatedSection: '',
           issueOrSuggest: '',
           reason: '',
           accessoryFile: ''
         })
-        this.dataList = [...this.dataList]
+        this.formInline = { ...this.formInline }
       },
       deleteData() {
-        this.dataList.pop()
-        this.dataList = [...this.dataList]
+        this.formInline.dataList.pop()
+        this.formInline = { ...this.formInline }
       }
     }
   }
diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
index f438e9690..bddbf9efc 100644
--- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
@@ -170,8 +170,9 @@
         })
       },
       submit() {
-        let dataList = this.$refs.feedbackInformationRef.dataList
-        this.insertBatch(dataList, 2)
+        this.$refs.evaluatorFeedbackRef.submitData()
+        // let dataList = this.$refs.feedbackInformationRef.dataList
+        // this.insertBatch(dataList, 2)
       },
       completeTask() {
         let query = {
diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
index 165d6d740..9d30aecbb 100644
--- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
@@ -134,7 +134,7 @@
       },
       preservation() {
         this.loading = true
-        let dataList = this.$refs.feedbackInformationRef.dataList
+        let dataList = this.$refs.feedbackInformationRef.formInline.dataList
         this.insertBatch(dataList, 1)
       },
       insertBatch(list, num) {
@@ -162,7 +162,7 @@
         })
       },
       submit() {
-        let dataList = this.$refs.feedbackInformationRef.dataList
+        let dataList = this.$refs.feedbackInformationRef.formInline.dataList
         this.insertBatch(dataList, 2)
       },
       completeTask() {

From ba56bc1ce316e4034190dbc69049e371d3802f2e Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Tue, 12 Jul 2022 14:19:36 +0800
Subject: [PATCH 018/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86-=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E5=B8=A6=E6=96=87=E4=BB=B6=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...wsOpinionAssessmentResultEOController.java |  19 +-
 .../entity/LawsOpinionAssessmentResultEO.java |   3 +
 ...ILawsOpinionAssessmentResultEOService.java |   4 +
 ...sOpinionAssessmentResultEOServiceImpl.java | 230 +++++++++++++++++-
 4 files changed, 250 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java
index a47f57b8f..8c14f5d6c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java
@@ -3,6 +3,7 @@ package com.jero.modules.lawsOpinionGather.controller;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -19,7 +20,6 @@ import com.jero.common.system.base.controller.JeroController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.jero.common.aspect.annotation.AutoLog;
@@ -153,10 +153,23 @@ public class LawsOpinionAssessmentResultEOController extends JeroController<Laws
     * @param request
     * @param lawsOpinionAssessmentResultEO
     */
-    @RequestMapping(value = "/exportXls")
+    /*@RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO) {
         return super.exportXls(request, lawsOpinionAssessmentResultEO, LawsOpinionAssessmentResultEO.class, "法规意见收集-评估结果表");
-    }
+    }*/
+
+	 /**
+	  * 导出excel
+	  * @param response
+	  * @param request
+	  * @param lawsOpinionAssessmentResultEO
+	  */
+	 @RequestMapping(value = "/exportXls")
+	 public void exportXls(HttpServletResponse response,HttpServletRequest request,
+						   LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO,
+						   @RequestParam Map<String,Object> params) {
+	 	this.lawsOpinionAssessmentResultEOService.exportXls(response,request, lawsOpinionAssessmentResultEO,params);
+	 }
 
     /**
       * 通过excel导入数据
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java
index a7712bfbf..446d76baa 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java
@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -82,6 +83,8 @@ public class LawsOpinionAssessmentResultEO implements Serializable {
 	@Excel(name = "附件", width = 15)
     @ApiModelProperty(value = "附件")
     private String accessoryFile;
+	@TableField(exist = false)
+    private String accessoryFileName;
 
 	/**提出时间*/
 	@Excel(name = "提出时间", width = 15, format = "yyyy-MM-dd")
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java
index f5f7a15c2..5fdc85844 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java
@@ -5,7 +5,9 @@ import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 法规意见收集-评估结果表
@@ -67,4 +69,6 @@ public interface ILawsOpinionAssessmentResultEOService extends IService<LawsOpin
 	 * @param json
 	 */
     void insertBatch(JSONObject json);
+
+    void exportXls(HttpServletResponse response, HttpServletRequest request, LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO, Map<String,Object> params);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java
index bb99b46a6..ada06b7e7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java
@@ -1,23 +1,44 @@
 package com.jero.modules.lawsOpinionGather.service.impl;
 
+import cn.hutool.core.util.ZipUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.utils.IOUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
+import com.jero.common.util.oss.CosBootUtil;
 import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO;
+import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO;
 import com.jero.modules.lawsOpinionGather.mapper.LawsOpinionAssessmentResultEOMapper;
 import com.jero.modules.lawsOpinionGather.service.ILawsOpinionAssessmentResultEOService;
+import com.jero.modules.oss.entity.OSSFile;
+import com.jero.modules.oss.service.IOSSFileService;
+import com.jero.modules.system.util.PDFUtils;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.shiro.SecurityUtils;
+import org.aspectj.util.FileUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Date;
+import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * @Description: 法规意见收集-评估结果表
@@ -28,6 +49,12 @@ import javax.servlet.http.HttpServletRequest;
 @Service
 public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOpinionAssessmentResultEOMapper, LawsOpinionAssessmentResultEO> implements ILawsOpinionAssessmentResultEOService {
 
+	@Value(value = "${jero.path.upload}")
+	private String uploadpath;
+
+	@Autowired
+	private IOSSFileService iOSSFileService;
+
 	/**
 	 * 保存
 	 *
@@ -125,4 +152,201 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
 			this.saveBatch(lawsOpinionAssessmentResultEOList);
 		}
 	}
+
+	@Override
+	public void exportXls(HttpServletResponse response, HttpServletRequest request, LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO, Map<String,Object> params) {
+
+		Integer pageNo = (Integer) params.getOrDefault("pageNo",1);
+		Integer pageSize = (Integer) params.getOrDefault("pageNo",10);
+		String exportAll = (String)params.get("exportAll");
+		String ids = (String)params.get("ids");
+		String cut = (String)params.get("cut");
+		String exportType = (String)params.get("exportType");
+		List<LawsOpinionAssessmentResultEO> exportData = new ArrayList<>();
+		QueryWrapper<LawsOpinionAssessmentResultEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsOpinionAssessmentResultEO, request.getParameterMap());
+		if(StringUtils.isNotEmpty(ids)){
+			List<String> idList = Arrays.asList(ids.split(","));
+			queryWrapper.lambda().in(LawsOpinionAssessmentResultEO::getId,idList);
+		}
+		if(StringUtils.equals(exportAll,"yes")){
+			exportData = this.baseMapper.selectList(queryWrapper);
+		}else {
+			Page<LawsOpinionAssessmentResultEO> page = new Page<LawsOpinionAssessmentResultEO>(pageNo, pageSize);
+			IPage<LawsOpinionAssessmentResultEO> pageList = this.page(page, queryWrapper);
+			exportData = pageList.getRecords();
+		}
+
+		this.disposeData(exportData,cut);
+
+		String title = "";
+		String fileName = "";
+		if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+			title = "相关章节,问题/建议,理由,附件,评估人,提出时间";
+			fileName = "评估结果 " + ".xlsx";
+		}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+			title = "Related section,IssueOrSuggest,Reason,Accessory,Evaluator,Submit Date";
+			fileName = "Evaluation results " + ".xlsx";
+		}
+
+		OutputStream os = null;
+		HSSFWorkbook workbook = new HSSFWorkbook();
+
+		try {
+			response.setHeader("Content-Disposition",
+					"attachment; filename=" + fileName);
+			response.setContentType("application/force-download");
+
+			HSSFSheet sheet = workbook.createSheet("sheet1");
+
+			CellStyle titleCellStyle = workbook.createCellStyle();
+			titleCellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中
+			titleCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//水平居中
+			titleCellStyle.setWrapText(true);//自动换行
+
+			Row firstRow = sheet.createRow(0);
+
+			//创建表头
+			String[] titleArr = title.split(",");
+			for (int i=0; i<=5; i++){
+				sheet.setColumnWidth(i,4000);
+				Cell cell = firstRow.createCell(i);
+				cell.setCellStyle(titleCellStyle);
+				cell.setCellValue(titleArr[i]);
+			}
+
+			//设置导出数据
+			if(CollectionUtils.isNotEmpty(exportData)) {
+				for (int dataIndex = 0; dataIndex < exportData.size(); dataIndex++) {
+					Row dataRow = sheet.createRow(dataIndex + 1);
+					dataRow.createCell(0).setCellValue(exportData.get(dataIndex).getRelatedSection());
+					dataRow.createCell(1).setCellValue(exportData.get(dataIndex).getIssueOrSuggest());
+					dataRow.createCell(2).setCellValue(exportData.get(dataIndex).getReason());
+					dataRow.createCell(3).setCellValue(exportData.get(dataIndex).getAccessoryFileName());
+					dataRow.createCell(4).setCellValue(exportData.get(dataIndex).getCreateBy());
+					String submitTimeStr = disposeDate(exportData.get(dataIndex).getSubmitTime());
+					dataRow.createCell(5).setCellValue(submitTimeStr);
+				}
+			}
+			if ("excel".equals(exportType)) {
+				os = response.getOutputStream();
+				workbook.write(os);
+				os.flush();
+			}else {
+				String path = uploadpath + "/tempZip/evaluationResults";
+				File fileTemp = new File(path);
+				if (fileTemp.exists()) {
+					fileTemp.delete();
+				}
+				fileTemp.mkdirs();
+				//excel
+				OutputStream excelOS = new FileOutputStream(path + File.separator + fileName);
+				workbook.write(excelOS);
+				excelOS.flush();
+
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+				LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+				for (LawsOpinionAssessmentResultEO data : exportData) {
+					String accessoryFile = data.getAccessoryFile();
+
+					List<OSSFile> fileInfosList = iOSSFileService.getFileInfos(accessoryFile);
+					if (fileInfosList.size() != 0) {
+						for (OSSFile ossFile : fileInfosList) {
+							String url = ossFile.getUrl();
+							//判断文件是否存在
+							if(StringUtils.isNotBlank(url)){
+								//判断文件是否存在
+								boolean b = CosBootUtil.doesObjectExist(url);
+								if(b){
+									InputStream download = CosBootUtil.download(url);
+									if(url.endsWith(".pdf") || url.endsWith(".PDF")){
+										String currentTime = sdf.format(new Date());
+										String waterContent = loginUser.getUsername() + " " + currentTime;
+										File newFile = PDFUtils.PDFWatermark(download,uploadpath,ossFile.getFileName(),waterContent);
+										download = new FileInputStream(newFile.getPath());
+									}
+									copyFile(download, path + File.separator + ossFile.getFileName());
+								}
+							}
+						}
+					}
+				}
+				ZipUtil.zip(path, path + ".zip");
+				//文件
+				FileInputStream fis = new FileInputStream(path + ".zip");
+				os = response.getOutputStream();
+
+				int len = 0;
+				while ((len = fis.read()) != -1) {
+					os.write(len);
+				}
+				os.flush();
+				fis.close();
+			}
+
+		}catch (IOException ex){
+			if(CutEnum.CN.getValue().equals(cut)){
+				throw new JeroBootException("下载文件失败");
+			}else{
+				throw new JeroBootException("Failed to download file");
+			}
+		}finally {
+			IOUtils.closeQuietly(os);
+			File file = new File(uploadpath + "/tempZip/evaluationResults");
+			FileUtil.deleteContents(file);
+			File fileTemp = new File(uploadpath + "/tempZip/evaluationResults.zip");
+			FileUtil.deleteContents(fileTemp);
+		}
+	}
+
+	public static void copyFile(InputStream in, String newFile) throws IOException {
+		File file2 = new File(newFile);
+		if (!file2.exists()) {
+			file2.createNewFile();
+		}
+		try (FileOutputStream ou = new FileOutputStream(newFile);) {
+			byte[] bs = new byte[1024];
+			int count = 0;
+			while ((count = in.read(bs, 0, bs.length)) != -1) {
+				ou.write(bs, 0, count);
+			}
+			ou.flush();
+		} catch (IOException e) {
+			e.printStackTrace();
+			throw new IOException("复制文件失败！");
+		} finally {
+			in.close();
+		}
+	}
+
+	/**
+	 * 处理数据
+	 * @param datas
+	 * @param cut
+	 */
+	public void disposeData(List<LawsOpinionAssessmentResultEO> datas,String cut){
+		if(CollectionUtils.isNotEmpty(datas)){
+			for (LawsOpinionAssessmentResultEO data : datas) {
+				if(StringUtils.isNotEmpty(data.getAccessoryFile())){
+					List<OSSFile> accessoryFileList = iOSSFileService.getFileInfos(data.getAccessoryFile());
+					String accessoryFileName = accessoryFileList.stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
+					data.setAccessoryFileName(accessoryFileName);
+				}
+			}
+		}
+	}
+
+	public String disposeDate(Date date){
+		String result = "";
+		try {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			if(date != null){
+				result = sdf.format(date);
+			}
+		}catch (Exception ex){
+			ex.printStackTrace();
+			log.error("处理日期失败：" +ex.getMessage());
+		}
+		return result;
+	}
 }

From 055b70e61a6ccc1ceacfa8f55d5486751243297f Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 12 Jul 2022 14:22:24 +0800
Subject: [PATCH 019/103] =?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/common/lang/en-us.js                           | 1 +
 jero-web/src/common/lang/zh-cn.js                           | 1 +
 .../components/evaluationResultsList.vue                    | 6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 05586dcd0..313d0a2b1 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1117,4 +1117,5 @@ module.exports = {
   nameTechnicalDocument:'Name of technical document',
   chapter:'chapter',
   problemDescription:'Problem description',
+  filingExternalOpinions:'Filing of external opinions',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 700a6135c..d6238311a 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1121,4 +1121,5 @@ module.exports = {
   nameTechnicalDocument:'技术文件名称',
   chapter:'章节',
   problemDescription:'问题说明',
+  filingExternalOpinions:'对外意见归档',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
index a474a8892..f4230edc3 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
@@ -44,13 +44,13 @@
         />
       </div>
       <div>
-        <span class="text">对外意见归档:</span>
-        <div @click="clickButtonToUpload('opinionArchiveId')"
+        <span class="text">{{$t('filingExternalOpinions')}}:</span>
+        <div @click="clickButtonToUpload('opinionArchiveId')" style="color: #21c9cc"
              v-if="formInline.createBy == this.userInfoQuery.username" class="operator-text">
           <a-icon type="cloud-upload" />
           {{$t('clickUpload')}}
         </div>
-        <div @click="seeFileClick(formInline.opinionArchiveId)" class="operator-text">
+        <div @click="seeFileClick(formInline.opinionArchiveId)" style="color: #21c9cc" class="operator-text">
           <a-icon type="eye" />
           {{$t('viewFile')}}
         </div>

From d49a86e28bf89e92e9e8dd4828dd22f7510f4d2d Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Tue, 12 Jul 2022 14:48:59 +0800
Subject: [PATCH 020/103] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E3=80=81=E6=8F=92=E5=85=A5=E8=AF=84=E4=BC=B0=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AEsql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql            | 8 ++++++++
 .../modules/system/controller/SysCategoryController.java | 9 +++++++++
 .../system/service/impl/SysCategoryServiceImpl.java      | 2 ++
 3 files changed, 19 insertions(+)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index b3ad6c4a9..0fe7be784 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -326,3 +326,11 @@ CREATE TABLE `laws_technology_evaluation_result`  (
       `acti_proc_inst_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例id',
       PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估-评估结果表' ROW_FORMAT = Dynamic;
+
+
+-- 增加评估方式树形字典。
+INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1546745025973256194', '0', '评1', NULL, 'admin', '2022-07-12 14:35:26', 'admin', '2022-07-12 14:36:36', 'A01', '1546744902203539458', '1', 'P1', '333', 1, NULL, NULL, 0, NULL, 1);
+INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1546745149692641282', '0', '评2', NULL, 'admin', '2022-07-12 14:35:55', NULL, NULL, 'A01', '1546744902203539458', NULL, 'P2', NULL, 1, NULL, NULL, 0, NULL, 2);
+INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1546745318161055745', '1546745025973256194', '评1+1', NULL, 'admin', '2022-07-12 14:36:36', NULL, NULL, 'A01', '1546744902203539458', NULL, 'P1+1', NULL, 1, NULL, NULL, 0, NULL, 1);
+
+INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1546744902203539458', '评估方式', 'evaluation_method', '评估方式', 0, 'admin', '2022-07-12 14:34:56', NULL, NULL, NULL, NULL, 1, 0, '2', 1);
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
index 08d457698..7536ab487 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
@@ -594,4 +594,13 @@ public class SysCategoryController {
 		return Result.OK(sysCategoryService.getSysCategoryTree(flag));
 	}
 
+	/**
+	 * 只查询评估方式的树形数据字典
+	 * @return
+	 */
+	@GetMapping("/getEvaluationMethodTree")
+	public Result getevaluationMethodTree() {
+		String flag = "evaluation_method";
+		return Result.OK(sysCategoryService.getSysCategoryTree(flag));
+	}
 }
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java
index 2232b6ade..db4eeac8c 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java
@@ -273,6 +273,8 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
 			String dictId = "";
 			if("deliverable_template".equals(flag)){
 				dictId = sysCategoryMapper.getDictId("deliverable_template");
+			}else if("evaluation_method".equals(flag)){
+				dictId = sysCategoryMapper.getDictId("evaluation_method");
 			}else{
 				dictId = sysCategoryMapper.getFieldInfo("technology_territory");
 			}

From c98befca4ce05210ea942312f9d60b6df8306e91 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Tue, 12 Jul 2022 15:14:45 +0800
Subject: [PATCH 021/103] update

---
 .../impl/LawsOpinionAssessmentResultEOServiceImpl.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java
index ada06b7e7..23fc954b6 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java
@@ -156,8 +156,8 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
 	@Override
 	public void exportXls(HttpServletResponse response, HttpServletRequest request, LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO, Map<String,Object> params) {
 
-		Integer pageNo = (Integer) params.getOrDefault("pageNo",1);
-		Integer pageSize = (Integer) params.getOrDefault("pageNo",10);
+		Integer pageNo = (Integer) params.get("pageNo");
+		Integer pageSize = (Integer) params.get("pageSize");
 		String exportAll = (String)params.get("exportAll");
 		String ids = (String)params.get("ids");
 		String cut = (String)params.get("cut");

From 84cc6a3d809174d602a05a2f9c55fd42518453f2 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 12 Jul 2022 15:31:02 +0800
Subject: [PATCH 022/103] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E9=A1=B5=E4=BF=AE=E6=94=B9=20=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=93-=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3=20=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86=E5=8E=BB=E6=8E=89=E6=8A=80?=
 =?UTF-8?q?=E6=9C=AF=E9=A2=86=E5=9F=9F=20=E5=8F=82=E6=95=B0=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E=E5=AD=97=E7=AC=A6=E9=99=90=E5=88=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../src/components/tableCollection/index1.vue |  8 ++-
 .../commponts/customexportmodle.vue           | 59 +++++++++++-----
 .../parameter/managementdetails/index.vue     |  2 +
 .../parameterlist/components/addModel.vue     | 70 ++++++++++---------
 6 files changed, 86 insertions(+), 55 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 05586dcd0..b43170a80 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -389,6 +389,7 @@ module.exports = {
   whole: 'Whole',
   DocumentLibrary: 'Document Library',
   GeneralExportInformation:'General export information',
+  CustomizeExportInformation:'Customize export information',
   DocumentComparisonLibrary: 'Document comparison Library',
   weekly: 'Weekly',
   SyncLibrary: 'Sync to doc. library',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 700a6135c..c0a728c48 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -394,6 +394,7 @@ module.exports = {
   whole: '全部',
   DocumentLibrary: '文档库',
   GeneralExportInformation:'常规导出信息',
+  CustomizeExportInformation:'自定义导出信息',
   DocumentComparisonLibrary: '文档对比库',
   weekly: '周报',
   SyncLibrary: '同步至文档库',
diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue
index 0dc4b2e8e..2faa372e5 100644
--- a/jero-web/src/components/tableCollection/index1.vue
+++ b/jero-web/src/components/tableCollection/index1.vue
@@ -96,7 +96,7 @@
       </div>
     </a-modal>
     <!--  配置信息--->
-    <a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null">
+    <a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null" @cancel="hideModal">
       <div class="content-text">
         <div class="text-field">
           <span class="text-field-left" :title="$t('configurationName')">{{$t('configurationName')}}:</span>
@@ -290,12 +290,16 @@
         this.$emit('handlePreservation')
         this.getTableList()
       },
+      hideModal(){
+        this.areaVisibleView = false
+      },
       // 查看配置详细信息
       onClickSee(val) {
+        console.log(val)
         let _this = this
         this.areaVisibleView = true
         axios({
-          url: `/jero-boot/params/config/getById?id=${val.db_field_name}`,
+          url: `/jero-boot/report/detail/getConfig?id=${val.db_field_name}`,
           method: 'get',
           transformRequest: [function(data) {
             let ret = ''
diff --git a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue
index 550f1e191..c413fbf9e 100644
--- a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue
+++ b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue
@@ -17,6 +17,7 @@
               <a-col :span="24">
                 <div class="box-title-text">
                   <div class="title-text" :title="$t('configure')">
+                    <span class="Required">*</span>
                     <span>{{$t('configure')}}</span>
                   </div>
                   <a-form-model-item class="itemModel" prop="configIds">
@@ -41,14 +42,23 @@
               <a-col :span="24">
                 <div class="box-title-text">
                   <div class="title-text" :title="$t('CustomTemplateName')">
+                    <span class="Required">*</span>
                     <span>{{$t('CustomTemplateName')}}</span>
                   </div>
-                  <a-form-model-item class="itemModel" prop="certCategory">
-                    <j-dict-select-tag class="box-input" v-model="formInline.certCategory"
-                                       :placeholder="$t('PleaseSelect')+$t('CustomTemplateName')"
-                                       :type="'select'"
-                                       @input="certCategoryName"
-                                       :triggerChange="false" :dictCode="'cert_category'"/>
+                  <a-form-model-item class="itemModel" prop="exportTemplateId">
+                    <a-select v-model="formInline.exportTemplateId" class="box-input"  :placeholder="$t('PleaseSelect')+$t('CustomTemplateName')">
+                      <a-select-option
+                        v-for="mode in exportTemplatetOptions"
+                        :key="mode.value"
+                        :value="mode.value">
+                        {{ mode.label }}
+                      </a-select-option>
+                    </a-select>
+<!--                    <j-dict-select-tag class="box-input" v-model="formInline.exportTemplateId"-->
+<!--                                       :placeholder="$t('PleaseSelect')+$t('CustomTemplateName')"-->
+<!--                                       :type="'select'"-->
+<!--                                       @input="certCategoryName"-->
+<!--                                       :triggerChange="false" :dictCode="'cert_category'"/>-->
                   </a-form-model-item>
 
                 </div>
@@ -87,6 +97,7 @@ export default {
       confirmLoading: false,
       description:false,
       dictOptions:[],
+      exportTemplatetOptions:[],
       visible: false,
       required:false,
       disabled:false,
@@ -110,8 +121,8 @@ export default {
         description:[
           { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
         ],
-        status: [
-          { required: true, message: this.$t('PleaseSelect')+this.$t('status'), trigger: 'change' },
+        exportTemplateId: [
+          { required: true, message: this.$t('PleaseSelect')+this.$t('CustomTemplateName'), trigger: 'change' },
         ],
         fileConnectId: [
           { required: true, message: this.$t('PleaseSelect')+this.$t('attachmentTemplate'), trigger: 'change' },
@@ -160,9 +171,9 @@ export default {
       this.visible = true
       this.title = this.$t('CustomExport')
       this.formInline = {}
-      this.formInline.separator = ','
       this.formInline = {...this.formInline}
       this.getConfigure()
+      this.getexportTemplateId()
 
       this.$nextTick(() => {
         this.$refs['ruleForm'].clearValidate()
@@ -172,7 +183,7 @@ export default {
       let pram = {
         paramsManifestId: this.$route.query.id
       }
-      getAction('report/detail/getConfigLabelList', pram).then((res) => {
+      getAction('report/detail/getConfigLabelListCustom', pram).then((res) => {
         if (res.success) {
           console.log(res.result)
           this.dictOptions = res.result
@@ -181,6 +192,16 @@ export default {
         }
       })
     },
+    getexportTemplateId(){
+      getAction('report/detail/getTemplateLabelList', {}).then((res) => {
+        if (res.success) {
+          console.log(res.result)
+          this.exportTemplatetOptions = res.result
+        } else {
+          // this.$refs.uploadFile.perentHandleFunc()
+        }
+      })
+    },
     editModel(value) {
       this.visible = true
       this.title = '编辑'
@@ -213,17 +234,17 @@ export default {
           let url = this.url.ConventionalExport
           let Action = getAction
           let query = JSON.parse(JSON.stringify(this.formInline))
-          Object.keys(query).forEach(res => {
-            if (query[res] && query[res] instanceof Array) {
-              query[res] = query[res].join(',')
-            }
-          })
-          if(this.contentListStart){
-            query.certCategoryName = this.contentListStart
-          }
+          // Object.keys(query).forEach(res => {
+          //   if (query[res] && query[res] instanceof Array) {
+          //     query[res] = query[res].join(',')
+          //   }
+          // })
+          // if(this.contentListStart){
+          //   query.certCategoryName = this.contentListStart
+          // }
           query.paramsManifestId = this.$route.query.id
           this.confirmLoading = true
-          downloadFile('report/detail/exportNormal', this.$t('GeneralExportInformation')+'.zip', query)
+          downloadFile('report/detail/exportCustom', this.$t('CustomizeExportInformation')+'.zip', query)
           this.confirmLoading = false
         }
       })
diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue
index 6dc973175..3dc497d98 100644
--- a/jero-web/src/views/parameter/managementdetails/index.vue
+++ b/jero-web/src/views/parameter/managementdetails/index.vue
@@ -1,4 +1,5 @@
 <template>
+
   <a-card :bordered="false">
     <div class="table-page-search-wrapper doc-detail">
       <div class="Virtual-detail-header" style="top: 0">
@@ -225,6 +226,7 @@ export default {
   mounted() {
     // this.Getlist()
     this.getTableList()
+    document.title = this.$t('ParameterViewPage')
   },
   methods:{
     Getlist() {
diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index fa64eda56..b73aaaa2a 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -60,24 +60,39 @@
                 </a-form-model-item>
               </div>
             </a-col>
+<!--            <a-col :span="12">-->
+<!--              <div class="box-title-text">-->
+<!--                <div class="title-text">-->
+<!--                  <span class="Required">*</span>-->
+<!--                  <span class="title-text-text" :title="$t('NtechnicalField')">{{$t('NtechnicalField')}}</span>-->
+<!--                </div>-->
+<!--                <a-form-model-item class="itemModel" prop="technologyTerritory">-->
+<!--                  <a-tree-select-->
+<!--                    tree-node-filter-prop="title"-->
+<!--                    v-model="formInline.technologyTerritory"-->
+<!--                    :maxTagCount="1"-->
+<!--                    class="box-input"-->
+<!--                    :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                    style="width: 100%"-->
+<!--                    :tree-data="CategoryTreeList"-->
+<!--                    tree-checkable-->
+<!--                    :placeholder="$t('PleaseSelect')+$t('NtechnicalField')"-->
+<!--                  />-->
+<!--                </a-form-model-item>-->
+<!--              </div>-->
+<!--            </a-col>-->
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="Required">*</span>
-                  <span class="title-text-text" :title="$t('NtechnicalField')">{{$t('NtechnicalField')}}</span>
+                  <span class="title-text-text" :title="$t('NareaOfResponsibility')">{{$t('NareaOfResponsibility')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="technologyTerritory">
-                  <a-tree-select
-                    tree-node-filter-prop="title"
-                    v-model="formInline.technologyTerritory"
-                    :maxTagCount="1"
-                    class="box-input"
-                    :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                    style="width: 100%"
-                    :tree-data="CategoryTreeList"
-                    tree-checkable
-                    :placeholder="$t('PleaseSelect')+$t('NtechnicalField')"
-                  />
+                <a-form-model-item class="itemModel" prop="dutyTerritory">
+                  <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
+                                     :disabled="disabled"
+                                     :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
+                                     :type="'select'"
+                                     :triggerChange="false" :dictCode="'duty_territory'"/>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -99,21 +114,7 @@
                 </a-form-model-item>
               </div>
             </a-col>
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required">*</span>
-                  <span class="title-text-text" :title="$t('NareaOfResponsibility')">{{$t('NareaOfResponsibility')}}</span>
-                </div>
-                <a-form-model-item class="itemModel" prop="dutyTerritory">
-                  <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
-                                     :disabled="disabled"
-                                     :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
-                                     :type="'select'"
-                                     :triggerChange="false" :dictCode="'duty_territory'"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
+
           </a-row>
           <a-row :gutter="24">
             <a-col :span="24">
@@ -273,6 +274,7 @@
                                    style='height: 95px; width: 100%'
                                    :disabled="disabled"
                                    type="textarea"
+                                   :maxLength="1000"
                                    v-model="item.description"
                                    :placeholder="$t('PleaseEnter')+$t('NParameterDescription')"/>
                         </a-form-model-item>
@@ -377,7 +379,7 @@ export default {
           { required: true, message: this.$t('PleaseSelect')+this.$t('areaOfResponsibility'), trigger: 'change' },
         ],
         description: [
-          { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
+          { min:1, max: 100, message: this.$t('cantExeed')+'1000'+this.$t('characters'), trigger: 'blur' },
         ],
         controlType: [
           { required: true, message: this.$t('pleaseSelect')+this.$t('controlType'), trigger: 'change' },
@@ -602,11 +604,11 @@ export default {
       this.contentList = []
       this.contentListed = []
       this.visible = true
-      if(value.technologyTerritory.split(',').length === 1){
-        value.technologyTerritory = value.technologyTerritory
-      } else {
-        value.technologyTerritory = value.technologyTerritory.split(',')
-      }
+      // if(value.technologyTerritory.split(',').length === 1){
+      //   value.technologyTerritory = value.technologyTerritory
+      // } else {
+      //   value.technologyTerritory = value.technologyTerritory.split(',')
+      // }
       this.formInline = value
       this.title = this.$t('edit')
       this.flag = 0

From 0c6e385b8725bb1cf154bf50177f98b69ad00833 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 12 Jul 2022 15:39:24 +0800
Subject: [PATCH 023/103] =?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/initiatingProcess.vue          |   6 +-
 .../components/initiatingProcess.vue          | 104 ++++++++++--------
 .../technologyAssessment/index.vue            |  18 +--
 3 files changed, 71 insertions(+), 57 deletions(-)

diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
index 4c8e45171..c7e910665 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
@@ -260,9 +260,11 @@
         this.selectedRowKeys = value
         if (this.selectedRowKeys.length > 1) {
           this.selectedRowKeys.shift()
-          record.shift()
         }
-        this.selectedRowKeysRecord = record
+        this.selectedRowKeysRecord = record.filter(res=>{
+          return res.id == this.selectedRowKeys[0]
+        })
+        this.selectedRowKeysRecord = [...this.selectedRowKeysRecord]
       },
       clickButtonToUpload(item) {
         this.$refs.uploadFile.perentHandleFunc()
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
index 1cf238d6c..5130a4307 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -42,7 +42,7 @@
                 </div>
                 <div class="title-text-content"
                      :class="{'title-text-content-one':!isTrue}">
-                  件大事发的科技示范和的空间是否和是科技示范的空间是多少
+                  {{selectedRowKeysRecord[0] ? selectedRowKeysRecord[0].serial_number :''}}
                 </div>
                 <div class="title-text-right" v-if="isTrue">
                   <span @click="standardDecompositionDocumentClick">
@@ -73,13 +73,14 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
+                  <span class="title-text-text"
+                        :title="$t('uploadRelevantMaterials')">{{$t('uploadRelevantMaterials')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="accessory_id">
                   <a-button type="primary" class="button-text"
-                            @click="clickButtonToUpload('accessory_id')">
-                    {{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' ||
-                    formInline.accessory_id == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                            @click="clickButtonToUpload('relatedDataFileId')">
+                    {{ (formInline.relatedDataFileId === 'null' || formInline.relatedDataFileId === '' ||
+                    formInline.relatedDataFileId == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                     }}
                   </a-button>
                 </a-form-model-item>
@@ -94,7 +95,7 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="taskExplain">
                   <a-textarea :placeholder="$t('pleaseEnter')+$t('processBackground')"
-                              v-model="formInline.taskExplain"
+                              v-model="formInline.processBackground"
                               :rows="4"/>
                 </a-form-model-item>
               </div>
@@ -108,7 +109,7 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="remarks">
                   <a-textarea :placeholder="$t('pleaseEnter')+$t('remarks')"
-                              v-model="formInline.remarks"
+                              v-model="formInline.remark"
                               :rows="4"/>
                 </a-form-model-item>
               </div>
@@ -121,20 +122,18 @@
                   <span class="Required">*</span>
                   <span class="title-text-text" :title="$t('evaluationMethod')">{{$t('evaluationMethod')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="evaluatorIdsName">
-                  <a-select :placeholder="$t('PleaseSelect')+$t('evaluationMethod')"
-                            class="box-input"
-                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                            allowClear
-                            v-model="formInline.gatherResult">
-                    <a-select-option v-for="(item, key) in gatherResultList"
-                                     :key="key"
-                                     :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.name">
-                           {{ item.name }}
-                     </span>
-                    </a-select-option>
-                  </a-select>
+                <a-form-model-item class="itemModel" prop="gatherResult">
+                  <a-tree-select
+                    tree-node-filter-prop="title"
+                    v-model="formInline.evaluationMethods"
+                    :maxTagCount="1"
+                    :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                    class="box-input"
+                    style="width: 100%"
+                    :tree-data="gatherResultList"
+                    tree-checkable
+                    :placeholder="$t('PleaseSelect')+$t('evaluationMethod')"
+                  />
                 </a-form-model-item>
               </div>
             </a-col>
@@ -144,13 +143,13 @@
                   <span class="Required">*</span>
                   <span class="title-text-text" :title="$t('Assessor')">{{$t('Assessor')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="evaluatorIdsName">
+                <a-form-model-item class="itemModel" prop="evaluatorsName">
                   <PersonnelSelection class="box-input"
                                       :personneQuery="formInline"
-                                      :query="{db_field_name:'evaluatorIds',db_field_txt:$t('Assessor')}"
+                                      :query="{db_field_name:'evaluators',db_field_txt:$t('Assessor')}"
                                       :isInput="true"
                                       @change="PersonnelSelectionChange"
-                                      v-model="formInline.evaluatorIdsName"/>
+                                      v-model="formInline.evaluatorsName"/>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -211,16 +210,7 @@
         pageSize: 10,
         pageNo: 1,
         formInline: {},
-        gatherResultList: [
-          {
-            value: 'Underway',
-            name: this.$t('inProgress')
-          },
-          {
-            value: 'Completed',
-            name: this.$t('Finished')
-          }
-        ],
+        gatherResultList: [],
         rules: {
           endTime: [
             {
@@ -229,7 +219,7 @@
               trigger: 'change'
             }
           ],
-          evaluatorIdsName: [
+          evaluatorsName: [
             {
               required: true,
               message: this.$t('Assessor') + this.$t('cannotEmpty'),
@@ -288,6 +278,7 @@
     mounted() {
       document.title = this.$t('regulatoryEngineer') + this.$t('initiatingProcess')
       this.getList()
+      this.getEvaluationMethodTree()
       if (this.$route.query.whetherTobring == '1') {
         this.isTrue = true
       } else {
@@ -306,6 +297,15 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
+      getEvaluationMethodTree() {
+        getAction('/sys/category/getEvaluationMethodTree').then((res) => {
+          if (res.success) {
+            this.gatherResultList = res.result
+          } else {
+            this.gatherResultList = []
+          }
+        })
+      },
       pageOnChange(page) {
         this.pageNo = page
         this.getList()
@@ -336,11 +336,21 @@
       },
       onSelectChange(value, record) {
         this.selectedRowKeys = value
+        this.selectedRowKeysRecord = []
         if (this.selectedRowKeys.length > 1) {
           this.selectedRowKeys.shift()
-          record.shift()
         }
-        this.selectedRowKeysRecord = record
+        let content = record.filter(res => {
+          return res.id == this.selectedRowKeys[0]
+        })
+        if (content && content.length > 0){
+          this.selectedRowKeysRecord.push({
+            standId:content[0].id,
+            serialNumber:content[0].serial_number,
+            title:content[0].title,
+            technologyTerritory:content[0].technology_territory,
+          })
+        }
       },
       standardDecompositionDocumentClick() {
         if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length > 0) {
@@ -392,7 +402,7 @@
         str[0] = str[8] = str[13] = str[18] = str[23] = '-'
         return str.join('')
       },
-      submit() {
+      submit(startTime) {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
             if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length == 0) {
@@ -400,11 +410,16 @@
             } else {
               this.JLoading = true
               let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0])
-              value.standId = value.id
+              if (this.isTrue){
+                value.evaluationType = 'Item evaluation'
+              }else{
+                value.evaluationType = 'Feedback evaluation'
+              }
+              value.startTime = startTime
+              value.flowStatus = 'Underway'
               value.taskAffirmDueDate = value.endTime
-              delete value.id
               value.id = this.getUUID()
-              value.currentUserName = this.userInfo().username
+              value.regulationOwnerId = this.userInfo().id
               Object.keys(value).forEach(res => {
                 if (value[res] && value[res] instanceof String) {
                   value[res] = value[res].replace(/\"/g, '“')
@@ -418,7 +433,7 @@
       },
       startProcess(value) {
         let query = {
-          type: 5,
+          type: 6,
           msg: JSON.stringify(value).replace(/\"/g, '\'')
         }
         postAction('/workFlow/startProcess', query).then((res) => {
@@ -437,13 +452,10 @@
         }
         postAction('/workFlow/completeTask', query).then((res) => {
           if (res.success) {
-            // setTimeout(() => {
-            //   window.close()
-            // }, 1000)
             this.$message.success(this.$t('OperationSuccessful'))
             this.JLoading = false
             this.$router.push({
-              path: '/collectionOfRegulatoryOpinions'
+              path: '/technologyAssessment'
             })
           } else {
             this.JLoading = false
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
index 52090af72..991379955 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
@@ -49,7 +49,7 @@
                           class="box-input"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           allowClear
-                          v-model="queryParam.gatherResult">
+                          v-model="queryParam.flowStatus">
                   <a-select-option v-for="(item, key) in gatherResultList"
                                    :key="key"
                                    :value="item.value">
@@ -228,14 +228,14 @@
             align: 'center',
             width: 170,
             ellipsis: true,
-            dataIndex: 'evaluationMethod'
+            dataIndex: 'evaluationMethods'
           },
           {
             title: this.$t('ProcessStatus'),
             align: 'center',
             width: 170,
             ellipsis: true,
-            dataIndex: 'ProcessStatus'
+            dataIndex: 'flowStatus'
           },
           {
             title: this.$t('dateOfInitiation'),
@@ -256,7 +256,7 @@
             align: 'center',
             ellipsis: true,
             width: 170,
-            dataIndex: 'remarks'
+            dataIndex: 'remark'
           },
           {
             title: this.$t('operation'),
@@ -333,13 +333,13 @@
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
             this.visible = false
-            // let newUrl = this.$router.resolve({
-            //   path: '/evaluationInitiationProcess',
-            //   query: this.formInline
-            // })
             let newUrl = this.$router.resolve({
-              path: '/evaluationProcess'
+              path: '/evaluationInitiationProcess',
+              query: this.formInline
             })
+            // let newUrl = this.$router.resolve({
+            //   path: '/evaluationProcess'
+            // })
             window.open(newUrl.href, '_blank')
           }
         })

From 1f53cfd55643ac516b731a48a10d29ee223a49f7 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 12 Jul 2022 16:16:07 +0800
Subject: [PATCH 024/103] =?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/initiatingProcess.vue          | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
index 5130a4307..2731a6cd9 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -42,7 +42,7 @@
                 </div>
                 <div class="title-text-content"
                      :class="{'title-text-content-one':!isTrue}">
-                  {{selectedRowKeysRecord[0] ? selectedRowKeysRecord[0].serial_number :''}}
+                  {{selectedRowKeysRecord[0] ? selectedRowKeysRecord[0].serialNumber :''}}
                 </div>
                 <div class="title-text-right" v-if="isTrue">
                   <span @click="standardDecompositionDocumentClick">
@@ -343,12 +343,12 @@
         let content = record.filter(res => {
           return res.id == this.selectedRowKeys[0]
         })
-        if (content && content.length > 0){
+        if (content && content.length > 0) {
           this.selectedRowKeysRecord.push({
-            standId:content[0].id,
-            serialNumber:content[0].serial_number,
-            title:content[0].title,
-            technologyTerritory:content[0].technology_territory,
+            standId: content[0].id,
+            serialNumber: content[0].serial_number,
+            title: content[0].title,
+            technologyTerritory: content[0].technology_territory
           })
         }
       },
@@ -410,9 +410,9 @@
             } else {
               this.JLoading = true
               let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0])
-              if (this.isTrue){
+              if (this.isTrue) {
                 value.evaluationType = 'Item evaluation'
-              }else{
+              } else {
                 value.evaluationType = 'Feedback evaluation'
               }
               value.startTime = startTime
@@ -421,6 +421,9 @@
               value.id = this.getUUID()
               value.regulationOwnerId = this.userInfo().id
               Object.keys(value).forEach(res => {
+                if (value[res] && value[res] instanceof Array) {
+                  value[res] = value[res].join(',')
+                }
                 if (value[res] && value[res] instanceof String) {
                   value[res] = value[res].replace(/\"/g, '“')
                   value[res] = value[res].replace(/\'/g, '‘')

From d7ac0ab397a3155bc00cb1dce81bf5bc73d63e5f Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Tue, 12 Jul 2022 16:34:44 +0800
Subject: [PATCH 025/103] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9-=E5=8F=98=E6=9B=B4:=E5=8F=82=E6=95=B0=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E=E9=99=90=E5=88=B61000=E5=AD=97=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql | 25 +++++++++++++++++++
 .../service/impl/ParamsInfoEOServiceImpl.java |  4 +--
 .../impl/ParamsInfoPublishEOServiceImpl.java  |  5 ++--
 .../parameterlist/components/addModel.vue     |  6 ++---
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 0fe7be784..c2be63920 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -334,3 +334,28 @@ INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_ti
 INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1546745318161055745', '1546745025973256194', '评1+1', NULL, 'admin', '2022-07-12 14:36:36', NULL, NULL, 'A01', '1546744902203539458', NULL, 'P1+1', NULL, 1, NULL, NULL, 0, NULL, 1);
 
 INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `dict_en_name`, `is_tag_dict`, `is_read_only`, `attribute_type`, `order_num`) VALUES ('1546744902203539458', '评估方式', 'evaluation_method', '评估方式', 0, 'admin', '2022-07-12 14:34:56', NULL, NULL, NULL, NULL, 1, 0, '2', 1);
+
+-- 参数项清单  修改字段长度 2022-07-12
+ALTER TABLE `laws_weilai`.`params_info`
+    MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `duty_territory`;
+
+ALTER TABLE `laws_weilai`.`cert_category_params_info`
+    MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `params_name`;
+
+ALTER TABLE `laws_weilai`.`params_info_publish`
+    MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `duty_territory`;
+
+ALTER TABLE `laws_weilai`.`cert_category_params_info_publish`
+    MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `params_name`;
+
+ALTER TABLE `laws_weilai`.`params_collect_manifest`
+    MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `duty_territory`;
+
+ALTER TABLE `laws_weilai`.`params_collect_manifest_history`
+    MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `params_batch`;
+
+ALTER TABLE `laws_weilai`.`params_report_detail`
+    MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `duty_territory`;
+
+ALTER TABLE `laws_weilai`.`report_cert_category_params_info`
+    MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `params_name`;
\ No newline at end of file
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
index 0c2e0f47a..04a07a6a6 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
@@ -1211,7 +1211,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 
 			// 参数说明
 			String description = dto.getDescription();
-			resultMap = validateMustAndLength(description,"参数说明", "Description", IsMustEnum.NO.getValue(),"200",false,cut);
+			resultMap = validateMustAndLength(description,"参数说明", "Description", IsMustEnum.NO.getValue(),"1000",false,cut);
 			errorMsg += (String)resultMap.get("errorMsg");
 			countError += (int)resultMap.get("countError");
 
@@ -1405,7 +1405,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 				countError += (int)resultMap.get("countError");
 				// 参数说明
 				String description = ccDto.getDescription();
-				resultMap = validateMustAndLength(description, "参数说明", "Description", IsMustEnum.NO.getValue(),"200", false, cut);
+				resultMap = validateMustAndLength(description, "参数说明", "Description", IsMustEnum.NO.getValue(),"1000", false, cut);
 				errorMsg += (String)resultMap.get("errorMsg");
 				countError += (int)resultMap.get("countError");
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java
index 2f89eed11..db5538fcf 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java
@@ -13,8 +13,9 @@ import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
-import javax.transaction.Transactional;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -27,7 +28,7 @@ import java.util.UUID;
  * @Version: V1.0
  */
 @Service
-@Transactional
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
 public class ParamsInfoPublishEOServiceImpl extends ServiceImpl<ParamsInfoPublishEOMapper, ParamsInfoPublishEO> implements IParamsInfoPublishEOService {
 
 	@Autowired
diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index b73aaaa2a..e1f29c840 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -379,7 +379,7 @@ export default {
           { required: true, message: this.$t('PleaseSelect')+this.$t('areaOfResponsibility'), trigger: 'change' },
         ],
         description: [
-          { min:1, max: 100, message: this.$t('cantExeed')+'1000'+this.$t('characters'), trigger: 'blur' },
+          { min:1, max: 1000, message: this.$t('cantExeed')+'1000'+this.$t('characters'), trigger: 'blur' },
         ],
         controlType: [
           { required: true, message: this.$t('pleaseSelect')+this.$t('controlType'), trigger: 'change' },
@@ -667,8 +667,8 @@ export default {
         }
         if(item.description !== undefined && item.description !== null){
           // 参数说明的限制
-          if(item.description.length > 200){
-            this.$message.warning(this.$t('ParameterDescription')+this.$t('cantExeed')+'200'+this.$t('Characters'))
+          if(item.description.length > 1000){
+            this.$message.warning(this.$t('ParameterDescription')+this.$t('cantExeed')+'1000'+this.$t('Characters'))
             falg = 0
             return
           }

From ea19496982f007b7ff384591d6f8f39469d81ee4 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 12 Jul 2022 16:49:00 +0800
Subject: [PATCH 026/103] =?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/initiatingProcess.vue                | 13 ++++++++++---
 .../businessSupport/technologyAssessment/index.vue  |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
index 2731a6cd9..d51f228f7 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -418,7 +418,7 @@
               value.startTime = startTime
               value.flowStatus = 'Underway'
               value.taskAffirmDueDate = value.endTime
-              value.id = this.getUUID()
+              value.lawsTechnologyEvaluationId = this.getUUID()
               value.regulationOwnerId = this.userInfo().id
               Object.keys(value).forEach(res => {
                 if (value[res] && value[res] instanceof Array) {
@@ -437,13 +437,20 @@
       startProcess(value) {
         let query = {
           type: 6,
-          msg: JSON.stringify(value).replace(/\"/g, '\'')
+          ...value,
+          msg: JSON.stringify(value.evaluators).replace(/\"/g, '\'')
         }
         postAction('/workFlow/startProcess', query).then((res) => {
           if (res.success) {
-            this.completeTask(value, res.result)
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.JLoading = false
+            this.$router.push({
+              path: '/technologyAssessment'
+            })
+            // this.completeTask(value, res.result)
           } else {
             this.JLoading = false
+            this.$message.warning(this.$t('operationFailed'))
           }
         })
       },
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
index 991379955..02f48cd6f 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
@@ -160,7 +160,7 @@
       return {
         //url传参严格按照当前命名
         url: {
-          list: '',
+          list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/page',
           getSysCategoryTree: '/sys/category/getSysCategoryTree'
         },
         visible: false,

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 027/103] =?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 028/103] =?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 029/103] =?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)
             }
           })

From 71f659b5f92c1a36e5020bb04e3dfc44205316b9 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Tue, 12 Jul 2022 17:45:36 +0800
Subject: [PATCH 030/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=EF=BC=8C=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsTechnologyEvaluationEOController.java |  2 +
 .../entity/LawsTechnologyEvaluationEO.java    |  7 +++
 .../ILawsTechnologyEvaluationEOService.java   |  7 +++
 ...LawsTechnologyEvaluationEOServiceImpl.java | 54 ++++++++++++++++++-
 4 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
index f62943826..ada4ac7cb 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
@@ -53,10 +53,12 @@ public class LawsTechnologyEvaluationEOController extends JeroController<LawsTec
 	public Result<?> queryPageList(LawsTechnologyEvaluationEO lawsTechnologyEvaluationEO,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   @RequestParam(name="cut", defaultValue="cn") String cut,
 								   HttpServletRequest req) {
 		QueryWrapper<LawsTechnologyEvaluationEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationEO, req.getParameterMap());
 		Page<LawsTechnologyEvaluationEO> page = new Page<LawsTechnologyEvaluationEO>(pageNo, pageSize);
 		IPage<LawsTechnologyEvaluationEO> pageList = lawsTechnologyEvaluationEOService.page(page, queryWrapper);
+		this.lawsTechnologyEvaluationEOService.disposeData(pageList.getRecords(),cut);
 		return Result.OK(pageList);
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationEO.java
index bb3718991..37a7d210f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationEO.java
@@ -6,6 +6,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -82,16 +83,22 @@ public class LawsTechnologyEvaluationEO implements Serializable {
 	@Excel(name = "技术领域", width = 15)
     @ApiModelProperty(value = "技术领域")
     private String technologyTerritory;
+    @TableField(exist = false)
+    private String technologyTerritoryName;
 
 	/**评估方式*/
 	@Excel(name = "评估方式", width = 15)
     @ApiModelProperty(value = "评估方式")
     private String evaluationMethods;
+    @TableField(exist = false)
+    private String evaluationMethodsName;
 
 	/**流程状态*/
 	@Excel(name = "流程状态", width = 15)
     @ApiModelProperty(value = "流程状态")
     private String flowStatus;
+	@TableField(exist = false)
+    private String flowStatusName;
 
 	/**发起日期*/
 	@Excel(name = "发起日期", width = 15, format = "yyyy-MM-dd")
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java
index ba0402ba0..fd70dcc12 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java
@@ -67,4 +67,11 @@ public interface ILawsTechnologyEvaluationEOService extends IService<LawsTechnol
 	 * @return
 	 */
     Result<?> processCall(JSONObject jsonObject);
+
+	/**
+	 * 处理数据
+	 * @param records
+	 * @param cut
+	 */
+	void disposeData(List<LawsTechnologyEvaluationEO> records, String cut);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
index ef74f3786..2dc019550 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
@@ -3,20 +3,26 @@ package com.jero.modules.lawsTechnologyEvaluation.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jero.common.api.vo.Result;
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.exception.JeroBootException;
+import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO;
-import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
 import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationEOMapper;
 import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService;
 import com.jero.modules.project.enums.OperatorTypeEnum;
 import com.jero.modules.project.enums.RequestSourceEnum;
+import com.jero.modules.system.entity.SysCategory;
+import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Date;
+import java.util.stream.Collectors;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
@@ -28,6 +34,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechnologyEvaluationEOMapper, LawsTechnologyEvaluationEO> implements ILawsTechnologyEvaluationEOService {
 
+	@Autowired
+	private SysCategoryServiceImpl sysCategoryService;
+
 	/**
 	 * 保存
 	 *
@@ -122,4 +131,45 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 
 		return new Result<>().success("调用成功！");
 	}
+
+	@Override
+	public void disposeData(List<LawsTechnologyEvaluationEO> datas, String cut) {
+		if(CollectionUtils.isNotEmpty(datas)){
+			List<SysCategory> categoryList = sysCategoryService.list();
+			for (LawsTechnologyEvaluationEO data : datas) {
+				if(StringUtils.isNotEmpty(data.getEvaluationMethods())){
+					List<String> evaluationMethodsList = Arrays.asList(data.getEvaluationMethods().split(","));
+					String name = getTreeName(cut, categoryList, evaluationMethodsList);
+					data.setEvaluationMethodsName(name);
+				}
+				if(StringUtils.isNotEmpty(data.getFlowStatus())){
+					data.setFlowStatusName(GatherResultEnum.getTextByValue(data.getFlowStatus(),cut));
+				}
+				if(StringUtils.isNotEmpty(data.getTechnologyTerritory())){
+					List<String> technologyTerritory = Arrays.asList(data.getTechnologyTerritory().split(","));
+					String name = getTreeName(cut, categoryList, technologyTerritory);
+					data.setTechnologyTerritoryName(name);
+				}
+			}
+		}
+	}
+
+	private String getTreeName(String cut, List<SysCategory> categoryList, List<String> technologyTerritoryList) {
+		StringBuilder sb = new StringBuilder();
+		for (String technologyTerritory : technologyTerritoryList) {
+			List<SysCategory> collect = categoryList.stream().filter(e -> technologyTerritory.equals(e.getId())).collect(Collectors.toList());
+			if(collect.size() != 0){
+				if (CutEnum.CN.getValue().equals(cut)) {
+					sb.append(collect.get(0).getName() + ",");
+				} else {
+					sb.append(collect.get(0).getEnName()+ ",");
+				}
+			}
+		}
+		String technologyTerritoryName = "";
+		if (StringUtils.isNotBlank(sb)) {
+			technologyTerritoryName = sb.substring(0, sb.length() - 1);
+		}
+		return technologyTerritoryName;
+	}
 }

From ae1412cdd2cbfba752fa427be9198830e46c5423 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Tue, 12 Jul 2022 17:47:53 +0800
Subject: [PATCH 031/103] =?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=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/tableCollection/index.vue    | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 758291e89..1399e3518 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -509,12 +509,25 @@
       getTableListReset() {
         let params = {
           paramsManifestId: this.$route.query.id,
-          userTypes: this.currentPersonRole
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          // userTypes: this.currentPersonRole
         }
+        let url
         this.loading = true
         this.$emit('listReset', '')
         // todo
-        getAction(this.url.tableList, params).then((res) => {
+        if (this.$route.query.it === undefined) {
+          // 页面跳转
+          url = this.url.tableList
+          params.paramsManifestId = this.$route.query.id
+          params.userTypes = this.currentPersonRole
+        } else {
+          // 历史版本
+          url = 'params/collectManifestHistory/list'
+          params.paramsManifestId = this.$route.query.it
+        }
+        getAction(url, params).then((res) => {
           if (res.success) {
             let tt = []
             if (this.currentPersonRole !== 'dre') {

From 371d784ae1d97f5da881b2b9ade659de745e2503 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Tue, 12 Jul 2022 18:04:34 +0800
Subject: [PATCH 032/103] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E5=BA=93=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=8A=80=E6=9C=AF=E9=A2=86?=
 =?UTF-8?q?=E5=9F=9Fid=E5=AD=97=E6=AE=B5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../document/service/impl/BussDocumentLibraryEOServiceImpl.java | 2 ++
 1 file changed, 2 insertions(+)

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 85a5e52d1..655b5e6f3 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
@@ -5722,11 +5722,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         //下拉选处理数据字典
         for (Map record : records) {
             Map<String, Object> record1 = (Map) record;
+            String technology_territory = (String)record1.get("technology_territory");
             for (Map.Entry<String, Object> entry : record1.entrySet()) {
                 //下拉选处理数据字典
                 dictItem(sysDictItems, entry, cut, fieldList,null);
                 treeDictItem(categoryList, entry, treeFieldList, cut,null);
             }
+            record1.put("technology_territory_id",technology_territory);
         }
         return infoPage;
     }

From 9eb9fe4e4fd3f653c9d2f403bf5150ff8450ff20 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 12 Jul 2022 18:08:37 +0800
Subject: [PATCH 033/103] =?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

---
 .../technologyAssessment/components/initiatingProcess.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
index 29abc1c70..c7156aeaf 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -348,7 +348,7 @@
             standId: content[0].id,
             serialNumber: content[0].serial_number,
             title: content[0].title,
-            technologyTerritory: content[0].technology_territory
+            technologyTerritory: content[0].technology_territory_id
           })
         }
       },

From d6519656c19a79e8a7f592b171111c7150687d64 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Tue, 12 Jul 2022 18:23:03 +0800
Subject: [PATCH 034/103] update

---
 .../modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java   | 2 +-
 .../service/impl/LawsOpinionGatherEOServiceImpl.java            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java
index 35461f2e7..5e5a18fcf 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java
@@ -77,7 +77,7 @@ public class LawsOpinionGatherEO implements Serializable {
     private String technologyTerritory;
 	@TableField(exist = false)
     /**技术领域展示字段*/
-    private String technologyTerritoryShow;
+    private String technologyTerritoryName;
 
 	/**收集结果*/
 	@Excel(name = "收集结果", width = 15)
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java
index ef6aa374f..3107550fb 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java
@@ -151,7 +151,7 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
 				}
 				if(StringUtils.isNotEmpty(lawsOpinionGather.getTechnologyTerritory())){
 					String technologyTerritoryShow = disposeTechnologyTerritory(technologyTerritoryList, lawsOpinionGather.getTechnologyTerritory(), cut);
-					lawsOpinionGather.setTechnologyTerritoryShow(technologyTerritoryShow);
+					lawsOpinionGather.setTechnologyTerritoryName(technologyTerritoryShow);
 				}
 				if(StringUtils.isNotEmpty(lawsOpinionGather.getOpinionArchiveId())){
 					List<OSSFile> opinionArchiveFileList = iOSSFileService.getFileInfosByConnectId(StringUtils.join(lawsOpinionGather.getOpinionArchiveId(), ","));

From 195a581f948193262ec865524a85bf177c673ba1 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Tue, 12 Jul 2022 18:53:33 +0800
Subject: [PATCH 035/103] update

---
 .../LawsOpinionAssessmentResultEOServiceImpl.java  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java
index 23fc954b6..3679cf031 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java
@@ -156,8 +156,8 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
 	@Override
 	public void exportXls(HttpServletResponse response, HttpServletRequest request, LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO, Map<String,Object> params) {
 
-		Integer pageNo = (Integer) params.get("pageNo");
-		Integer pageSize = (Integer) params.get("pageSize");
+		Integer pageNo = Integer.parseInt(params.get("pageNo").toString());
+		Integer pageSize = Integer.parseInt(params.get("pageSize").toString());
 		String exportAll = (String)params.get("exportAll");
 		String ids = (String)params.get("ids");
 		String cut = (String)params.get("cut");
@@ -191,6 +191,8 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
 		OutputStream os = null;
 		HSSFWorkbook workbook = new HSSFWorkbook();
 
+		String path = uploadpath + "/tempZip/evaluationResults/" + System.currentTimeMillis();
+
 		try {
 			response.setHeader("Content-Disposition",
 					"attachment; filename=" + fileName);
@@ -227,12 +229,13 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
 					dataRow.createCell(5).setCellValue(submitTimeStr);
 				}
 			}
+
 			if ("excel".equals(exportType)) {
 				os = response.getOutputStream();
 				workbook.write(os);
 				os.flush();
 			}else {
-				String path = uploadpath + "/tempZip/evaluationResults";
+
 				File fileTemp = new File(path);
 				if (fileTemp.exists()) {
 					fileTemp.delete();
@@ -282,6 +285,7 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
 				}
 				os.flush();
 				fis.close();
+				excelOS.close();
 			}
 
 		}catch (IOException ex){
@@ -292,9 +296,9 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
 			}
 		}finally {
 			IOUtils.closeQuietly(os);
-			File file = new File(uploadpath + "/tempZip/evaluationResults");
+			File file = new File(path);
 			FileUtil.deleteContents(file);
-			File fileTemp = new File(uploadpath + "/tempZip/evaluationResults.zip");
+			File fileTemp = new File(path + ".zip");
 			FileUtil.deleteContents(fileTemp);
 		}
 	}

From 51fd2af431de46c68f7b12826a963ce951356782 Mon Sep 17 00:00:00 2001
From: xiaowenyu <xiaowenyu>
Date: Tue, 12 Jul 2022 20:17:44 +0800
Subject: [PATCH 036/103] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=87=E6=B3=A8=E5=B7=B2=E5=90=8C=E6=AD=A5=E6=AD=A3?=
 =?UTF-8?q?=E5=BC=8F=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index c2be63920..d1f370f85 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -358,4 +358,5 @@ ALTER TABLE `laws_weilai`.`params_report_detail`
     MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `duty_territory`;
 
 ALTER TABLE `laws_weilai`.`report_cert_category_params_info`
-    MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `params_name`;
\ No newline at end of file
+    MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `params_name`;
+--以上SQL 2022年7月12日 已同步正式环境
\ No newline at end of file

From d48606cad38e997a0fcfe773f066569c88125f4c Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 13 Jul 2022 11:02:22 +0800
Subject: [PATCH 037/103] =?UTF-8?q?=E5=B8=83=E5=B1=80=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

---
 jero-web/src/common/lang/en-us.js             |   5 +
 jero-web/src/common/lang/zh-cn.js             |   5 +
 jero-web/src/components/layouts/TabLayout.vue |   2 +
 jero-web/src/config/router.config.js          |  10 +
 .../components/evaluationResultsList.vue      |   6 +-
 .../components/evaluationResultsClause.vue    | 334 ++++++++++++++++++
 .../components/evaluationResultsWhole.vue     | 262 ++++++++++++++
 .../technologyAssessment/index.vue            |  19 +-
 8 files changed, 633 insertions(+), 10 deletions(-)
 create mode 100644 jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue
 create mode 100644 jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 6178f5f41..d6a2427e1 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1119,4 +1119,9 @@ module.exports = {
   chapter:'chapter',
   problemDescription:'Problem description',
   filingExternalOpinions:'Filing of external opinions',
+  regulatoryTechnicalEvaluationResults:'Regulatory technical evaluation results',
+  initiateProcessForCurrentStandard:'Initiate process for current standard',
+  engineerFeedbackResults:'Engineer feedback results',
+  fileExport:'File export',
+  feedbackTime:'Feedback time',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 8a5cd55ea..182b67d00 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1022,6 +1022,7 @@ module.exports = {
   closingDate: '截止日期',
   viewProcess: '查看流程',
   evaluationResults: '评估结果',
+  regulatoryTechnicalEvaluationResults:'法规技术评估结果',
   Assessor:'评估人',
   collectionOfRegulatoryOpinions:'法规意见收集',
   collectionOfRegulatoryOpinionsProcess:'法规意见收集流程',
@@ -1123,4 +1124,8 @@ module.exports = {
   chapter:'章节',
   problemDescription:'问题说明',
   filingExternalOpinions:'对外意见归档',
+  initiateProcessForCurrentStandard:'针对当前标准发起流程',
+  engineerFeedbackResults:'工程师反馈结果',
+  fileExport:'文件导出',
+  feedbackTime:'反馈时间',
 }
\ No newline at end of file
diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue
index d2b7479b0..216d49f12 100644
--- a/jero-web/src/components/layouts/TabLayout.vue
+++ b/jero-web/src/components/layouts/TabLayout.vue
@@ -98,6 +98,8 @@
           this.$route.path == '/projectStatusAndProgress' ||
           this.$route.path == '/TaskPlanList' ||
           this.$route.path == '/evaluationProcess' ||
+          this.$route.path == '/evaluationResultsClause' ||
+          this.$route.path == '/evaluationResultsWhole' ||
           this.$route.path == '/evaluationInitiationProcess' ||
           this.$route.path == '/historicalVersion' ||
           this.$route.path == '/dashboard/analysis' ||
diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js
index b544ebd0b..648696c1d 100644
--- a/jero-web/src/config/router.config.js
+++ b/jero-web/src/config/router.config.js
@@ -347,6 +347,16 @@ export const constantRouterMap = [
     name: 'evaluationInitiationProcess',
     component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/technologyAssessment/components/initiatingProcess')
   },
+  {
+    path: '/evaluationResultsWhole',
+    name: 'evaluationResultsWhole',
+    component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/technologyAssessment/components/evaluationResultsWhole')
+  },
+  {
+    path: '/evaluationResultsClause',
+    name: 'evaluationResultsClause',
+    component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/technologyAssessment/components/evaluationResultsClause')
+  },
   // {
   //   path: '/ParameterItemCollection',
   //   name: 'ParameterItemCollection',
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
index f4230edc3..61b515122 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
@@ -178,9 +178,9 @@
       handleExport() {
         let query = {
           pageSize:this.pageSize,
-          pageNo:this.pageNo
-          // lawsOpinionGatherId: this.lawsOpinionGatherId,
-          // actiProcInstId: this.actiProcInstId
+          pageNo:this.pageNo,
+          lawsOpinionGatherId: this.lawsOpinionGatherId,
+          actiProcInstId: this.actiProcInstId
         }
         downloadFile('/lawsOpinionGather/lawsOpinionAssessmentResultEO/exportXls',
           this.$t('evaluationResults') + '.zip', query)
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue
new file mode 100644
index 000000000..0b5fc24c9
--- /dev/null
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue
@@ -0,0 +1,334 @@
+<template>
+  <div class="doc-detail">
+    <div class="doc-detail-wrap">
+      <div class="doc-detail-header" style="position: fixed;top: 0">
+        <div class="doc-detail-title">
+          <!--          <span style="line-height: 66px;display: inline-block;float: left">-->
+          <!--            <a-icon type="home" style="margin-right: 6px;"/>-->
+          <!--          </span>-->
+          {{$t('regulatoryTechnicalEvaluationResults')}}
+        </div>
+      </div>
+      <div style="padding-top: 68px;background: #fff">
+        <div class="detail-content">
+          <div class="content-box">
+            <div class="header-text">
+              {{$t('processBackground')}}
+              <a-button class="box-button-top" type="primary" @click="CurrentStandard">
+                {{$t('initiateProcessForCurrentStandard')}}
+              </a-button>
+            </div>
+            <div class="processBackground-text">
+              dskf' ;sdfl';s sd稍等景点风光大家分工法规地方官给，。不买；两个客人坦克；量大幅高开的管理骨科大夫给的快感的法律公开大家赶快来的风格
+            </div>
+            <div class="header-text">
+              {{$t('engineerFeedbackResults')}}
+            </div>
+            <a-card :bordered="false" class="box-clause">
+              <div class="table-page-search-wrapper">
+                <a-form layout="inline" @keyup.enter.native="searchQuery">
+                  <a-row :gutter="24">
+                    <a-col :md="6" :sm="8">
+                      <div class="box-title-text">
+                        <div class="title-text" :title="$t('Assessor')">
+                          <span>{{$t('Assessor')}}</span>
+                        </div>
+                        <PersonnelSelection class="box-input"
+                                            :personneQuery="queryParam"
+                                            :query="{db_field_name:'Assessor',db_field_txt:$t('Assessor')}"
+                                            :isInput="true"
+                                            @change="PersonnelSelectionChange"
+                                            v-model="queryParam.AssessorName"/>
+                      </div>
+                    </a-col>
+                    <a-col :md="6" :sm="8">
+                      <div class="box-title-text">
+                        <div class="title-text" :title="$t('complianceResults')">
+                          <span>{{$t('complianceResults')}}</span>
+                        </div>
+                        <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('complianceResults')"
+                                 v-model="queryParam.title"></j-input>
+                      </div>
+                    </a-col>
+                    <span style="float: right;overflow: hidden;" 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-col>
+                </span>
+                  </a-row>
+                </a-form>
+              </div>
+              <div class="table-operator">
+                <div @click="fileExportClick" class="operator-text">
+                  <a-icon type="apartment"/>
+                  {{$t('fileExport')}}
+                </div>
+              </div>
+              <div>
+                <a-table
+                  ref="table"
+                  size="middle"
+                  :loading="loading"
+                  :pagination="false"
+                  :scroll="{x: '100%'}"
+                  rowKey="id"
+                  :data-source="dataSource"
+                  :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+                  :columns="columns"
+                >
+                </a-table>
+                <!--                <div class="page" v-if="dataSource && dataSource.length > 0">-->
+                <!--                  <a-pagination-->
+                <!--                    :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
+                <!--                    show-quick-jumper-->
+                <!--                    show-size-changer-->
+                <!--                    :page-size.sync="pageSize"-->
+                <!--                    :total="total"-->
+                <!--                    :current="pageNo"-->
+                <!--                    @change="pageOnChange"-->
+                <!--                    @showSizeChange="SizeChange"-->
+                <!--                  />-->
+                <!--                </div>-->
+              </div>
+            </a-card>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
+  export default {
+    name: 'evaluationResultsClause',
+    components:{
+      PersonnelSelection
+    },
+    data() {
+      return {
+        queryParam: {},
+        dataSource: [],
+        selectedRowKeys: [],
+        loading: false,
+        columns: [
+          {
+            title: this.$t('clauseNo'),
+            dataIndex: 'items_num',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseName'),
+            dataIndex: 'items_name',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseContent'),
+            dataIndex: 'iterms_conditions',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('Assessor'),
+            dataIndex: 'Assessor',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('evaluationMethod'),
+            dataIndex: 'evaluationMethod',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('nameTechnicalDocument'),
+            dataIndex: 'nameTechnicalDocument',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('chapter'),
+            dataIndex: 'chapter',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('complianceResults'),
+            dataIndex: 'complianceResults',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('opinion'),
+            dataIndex: 'opinion',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('enclosure'),
+            dataIndex: 'enclosure',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('feedbackTime'),
+            dataIndex: 'feedbackTime',
+            align: 'center',
+            ellipsis: true
+          }
+        ]
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      CurrentStandard() {
+
+      },
+      onSelectChange(value) {
+
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      fileExportClick() {
+
+      },
+      PersonnelSelectionChange(value, id) {
+        this.queryParam[value] = id
+        this.queryParam = { ...this.queryParam }
+      },
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
+
+  .doc-detail {
+    background: #fff;
+    height: 100%;
+
+    .doc-detail-wrap {
+      .doc-detail-header {
+        width: 100%;
+        height: 68px;
+        line-height: 68px;
+        padding: 0 0 0 32px;
+        box-sizing: border-box;
+        display: flex;
+        justify-content: space-between;
+        border-bottom: 2px #eff1f3 solid;
+        background: #fff;
+
+        .doc-detail-title {
+          display: inline-block;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          overflow: hidden;
+          font-size: 20px;
+          font-weight: 400;
+          color: #040B29;
+          line-height: 68px;
+        }
+
+        .doc-detail-right {
+          width: 800px;
+          line-height: 68px;
+          display: flex;
+
+          .doc-detail-btn {
+            margin-left: 10px;
+          }
+        }
+      }
+
+      .content-box {
+        padding: 0 32px;
+        box-sizing: border-box;
+      }
+
+      .header-text {
+        font-size: 16px;
+        font-weight: 400;
+        height: 80px;
+        color: #000F16;
+        line-height: 80px;
+      }
+
+      .processBackground-text {
+        font-size: 16px;
+        color: #000F16;
+      }
+    }
+  }
+
+  .box-button-top {
+    float: right;
+    margin-top: 28px;
+    height: 38px;
+  }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 70px;
+    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;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+</style>
+<style>
+  .box-clause .ant-card-body {
+    padding: 0;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
new file mode 100644
index 000000000..f645cc16e
--- /dev/null
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
@@ -0,0 +1,262 @@
+<template>
+  <div class="doc-detail">
+    <div class="doc-detail-wrap">
+      <div class="doc-detail-header" style="position: fixed;top: 0">
+        <div class="doc-detail-title">
+          <!--          <span style="line-height: 66px;display: inline-block;float: left">-->
+          <!--            <a-icon type="home" style="margin-right: 6px;"/>-->
+          <!--          </span>-->
+          {{$t('regulatoryTechnicalEvaluationResults')}}
+        </div>
+      </div>
+      <div style="padding-top: 68px;background: #fff">
+        <div class="detail-content">
+          <div class="content-box">
+            <div class="header-text">
+              {{$t('processBackground')}}
+              <a-button class="box-button-top" type="primary" @click="CurrentStandard">
+                {{$t('initiateProcessForCurrentStandard')}}
+              </a-button>
+            </div>
+            <div class="processBackground-text">
+              dskf' ;sdfl';s sd稍等景点风光大家分工法规地方官给，。不买；两个客人坦克；量大幅高开的管理骨科大夫给的快感的法律公开大家赶快来的风格
+            </div>
+            <!--            <div class="header-text">-->
+            <!--              {{$t('engineerFeedbackResults')}}-->
+            <!--            </div>-->
+            <a-card :bordered="false" class="box-clause" style="margin-top: 20px" v-for="item in dataSource">
+              <div class="table-operator">
+                <div @click="fileExportClick" class="operator-text" style="float: left;font-size: 16px">
+                  {{$t('engineerFeedbackResults')}}
+                </div>
+                <div @click="fileExportClick" class="operator-text">
+                  <a-icon type="apartment"/>
+                  {{$t('fileExport')}}
+                </div>
+              </div>
+              <div>
+                <a-table
+                  ref="table"
+                  size="middle"
+                  :loading="loading"
+                  :pagination="false"
+                  :scroll="{x: '100%'}"
+                  :data-source="item.dataList"
+                  :columns="columns"
+                >
+                </a-table>
+              </div>
+            </a-card>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
+
+  export default {
+    name: 'evaluationResultsWhole',
+    components: {
+      PersonnelSelection
+    },
+    data() {
+      return {
+        queryParam: {},
+        dataSource: [
+          {
+            dataList:[
+              {
+                relevantSections:111,
+                problemDescription:222,
+                enclosure:'',
+              }
+            ]
+          },
+          {
+            dataList:[
+              {
+                relevantSections:111,
+                problemDescription:222,
+                enclosure:'',
+              }
+            ]
+          }
+        ],
+        selectedRowKeys: [],
+        loading: false,
+
+        columns: [
+          {
+            title: this.$t('relevantSections'),
+            dataIndex: 'relevantSections',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('problemDescription'),
+            dataIndex: 'problemDescription',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('enclosure'),
+            dataIndex: 'enclosure',
+            align: 'center',
+            ellipsis: true
+          }
+        ]
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      CurrentStandard() {
+
+      },
+      onSelectChange(value) {
+
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      fileExportClick() {
+
+      },
+      PersonnelSelectionChange(value, id) {
+        this.queryParam[value] = id
+        this.queryParam = { ...this.queryParam }
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
+
+  .doc-detail {
+    background: #fff;
+    height: 100%;
+
+    .doc-detail-wrap {
+      .doc-detail-header {
+        width: 100%;
+        height: 68px;
+        line-height: 68px;
+        padding: 0 0 0 32px;
+        box-sizing: border-box;
+        display: flex;
+        justify-content: space-between;
+        border-bottom: 2px #eff1f3 solid;
+        background: #fff;
+
+        .doc-detail-title {
+          display: inline-block;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          overflow: hidden;
+          font-size: 20px;
+          font-weight: 400;
+          color: #040B29;
+          line-height: 68px;
+        }
+
+        .doc-detail-right {
+          width: 800px;
+          line-height: 68px;
+          display: flex;
+
+          .doc-detail-btn {
+            margin-left: 10px;
+          }
+        }
+      }
+
+      .content-box {
+        padding: 0 32px;
+        box-sizing: border-box;
+      }
+
+      .header-text {
+        font-size: 16px;
+        font-weight: 400;
+        height: 80px;
+        color: #000F16;
+        line-height: 80px;
+      }
+
+      .processBackground-text {
+        font-size: 16px;
+        color: #000F16;
+      }
+    }
+  }
+
+  .box-button-top {
+    float: right;
+    margin-top: 28px;
+    height: 38px;
+  }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 70px;
+    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;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+</style>
+<style>
+  .box-clause .ant-card-body {
+    padding: 0;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
index 02f48cd6f..936c45306 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
@@ -92,9 +92,10 @@
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :columns="columns"
       >
+<!--         v-if="record.gatherResult == 'Completed'"-->
          <span slot="operation" slot-scope="text,record">
            <a class="text-operation" @click="viewProcessClick(record)">{{$t('viewProcess')}}</a>
-           <a class="text-operation" v-if="record.gatherResult == 'Completed'"
+           <a class="text-operation"
               @click="evaluationResultsClick(record)">{{$t('evaluationResults')}}</a>
         </span>
       </a-table>
@@ -186,11 +187,11 @@
         whetherTobringList: [
           {
             value: '1',
-            name: '是'
+            name: this.$t('yes')
           },
           {
             value: '2',
-            name: '否'
+            name: this.$t('not')
           }
         ],
         gatherResultList: [
@@ -221,21 +222,21 @@
             align: 'center',
             width: 170,
             ellipsis: true,
-            dataIndex: 'technologyTerritory'
+            dataIndex: 'technologyTerritoryName'
           },
           {
             title: this.$t('evaluationMethod'),
             align: 'center',
             width: 170,
             ellipsis: true,
-            dataIndex: 'evaluationMethods'
+            dataIndex: 'evaluationMethodsName'
           },
           {
             title: this.$t('ProcessStatus'),
             align: 'center',
             width: 170,
             ellipsis: true,
-            dataIndex: 'flowStatus'
+            dataIndex: 'flowStatusName'
           },
           {
             title: this.$t('dateOfInitiation'),
@@ -363,7 +364,11 @@
         window.open(newUrl.href, '_blank')
       },
       evaluationResultsClick(row) {
-        this.$refs.evaluationResultsListRef.getData(JSON.parse(JSON.stringify(row)))
+        let newUrl = this.$router.resolve({
+          path: '/evaluationResultsWhole',
+          query: row
+        })
+        window.open(newUrl.href, '_blank')
       }
     }
   }

From 7e4620f25c4a191521f225444bbd286dc889f895 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 13 Jul 2022 11:24:51 +0800
Subject: [PATCH 038/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=9D=A1=E6=AC=BE=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=20=20=E6=9F=A5=E8=AF=A2=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E5=BA=93=E5=88=97=E8=A1=A8=E8=B0=83=E7=94=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsTechnologyEvaluationEOController.java |  10 ++
 .../ILawsTechnologyEvaluationEOService.java   |   4 +
 ...LawsTechnologyEvaluationEOServiceImpl.java | 121 +++++++++++++++++-
 3 files changed, 132 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
index ada4ac7cb..8d18a4a05 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
@@ -2,6 +2,7 @@ package com.jero.modules.lawsTechnologyEvaluation.controller;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -183,4 +184,13 @@ public class LawsTechnologyEvaluationEOController extends JeroController<LawsTec
 		 return this.lawsTechnologyEvaluationEOService.processCall(jsonObject);
 	 }
 
+	 @ApiOperation(value="法规意见收集表中添加选择条款调用文档库数据--分页", notes="法规意见收集表中选择条款调用文档库数据--分页")
+	 @PostMapping(value = "/queryPageDummy")
+	 @ResponseBody
+	 public net.sf.json.JSONObject queryPageDummy(@RequestBody Map<String,Object> parameter) {
+		 IPage infoPage = this.lawsTechnologyEvaluationEOService.getPageDummy(parameter);
+		 Result<IPage> ok = Result.OK(infoPage);
+		 net.sf.json.JSONObject jsonResult = net.sf.json.JSONObject.fromObject(ok);
+		 return jsonResult;
+	 }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java
index fd70dcc12..ad017a213 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java
@@ -1,10 +1,12 @@
 package com.jero.modules.lawsTechnologyEvaluation.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.common.api.vo.Result;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 法规技术评估
@@ -74,4 +76,6 @@ public interface ILawsTechnologyEvaluationEOService extends IService<LawsTechnol
 	 * @param cut
 	 */
 	void disposeData(List<LawsTechnologyEvaluationEO> records, String cut);
+
+    IPage getPageDummy(Map<String, Object> parameter);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
index 2dc019550..31822ae7a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
@@ -2,25 +2,36 @@ package com.jero.modules.lawsTechnologyEvaluation.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.constant.enums.ModuleEnum;
 import com.jero.common.exception.JeroBootException;
+import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
+import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
+import com.jero.modules.document.enums.FieldTypeEnum;
+import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper;
+import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl;
 import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO;
 import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationEOMapper;
 import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService;
 import com.jero.modules.project.enums.OperatorTypeEnum;
 import com.jero.modules.project.enums.RequestSourceEnum;
+import com.jero.modules.split.entity.SarFileSplitInfoEO;
+import com.jero.modules.split.service.ISarFileSplitInfoService;
 import com.jero.modules.system.entity.SysCategory;
+import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
+import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Date;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -36,6 +47,16 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 
 	@Autowired
 	private SysCategoryServiceImpl sysCategoryService;
+	@Autowired
+	private OnlCgformFieldServiceImpl onlCgformFieldService;
+	@Autowired
+	private BussDocumentLibraryEOServiceImpl bussDocumentLibraryEOService;
+	@Autowired
+	private BussDocumentLibraryEOMapper bussDocumentLibraryEOMapper;
+	@Autowired
+	private SysDictItemServiceImpl sysDictItemServiceImpl;
+	@Autowired
+	private ISarFileSplitInfoService sarFileSplitInfoService;
 
 	/**
 	 * 保存
@@ -154,6 +175,100 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 		}
 	}
 
+	@Override
+	public IPage getPageDummy(Map<String, Object> parameter) {
+		String cut = (String) parameter.get("cut");//中英文切换标识
+		//文档库字段
+		List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
+
+		//需要查询的字段
+		List<String> fieldListQuery = new ArrayList<>();
+		fieldListQuery.add("serial_number");
+		fieldListQuery.add("title");
+		fieldListQuery.add("title_en");
+		fieldListQuery.add("state");
+		fieldListQuery.add("region");
+		fieldListQuery.add("technology_territory");
+		fieldListQuery.add("xin1_che1_xing2_shi2_shi1_ri4_qi1");
+		fieldListQuery.add("implement_time");
+		fieldListQuery.add("corresponding_standard");
+
+		List<String> fieldListNew = new ArrayList<>();
+		fieldListNew.add("id");
+
+		//转时间格式
+		for (String field : fieldListQuery) {
+			String fieldTemp = null;
+			if ("xin1_che1_xing2_shi2_shi1_ri4_qi1".equals(field) || "implement_time".equals(field)) {
+				String fieldNew = "date_format(" + field + ", '%Y-%m-%d')";
+				fieldTemp = "case when " + fieldNew + " is null then \"\" else " + fieldNew + " end " + field;
+				fieldListNew.add(fieldTemp);
+			} else {
+				fieldTemp = "case when " + field + " is null then \"\" else " + field + " end " + field;
+				fieldListNew.add(fieldTemp);
+			}
+		}
+		//过滤出文件字段
+		List<OnlCgformField> fileFieldList = fieldList.stream()
+				.filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType()))
+				.collect(Collectors.toList());
+		for (OnlCgformField onlCgformField : fileFieldList) {
+			fieldListNew.add(onlCgformField.getDbFieldName());
+		}
+
+		//封装查询条件
+		String condition = this.bussDocumentLibraryEOService.getConditionStr(parameter);
+		int pageNo = Integer.parseInt(parameter.get("pageNo").toString());
+		int pageSize = Integer.parseInt(parameter.get("pageSize").toString());
+		IPage page = new Page(pageNo, pageSize);
+
+		IPage infoPage = this.bussDocumentLibraryEOMapper.getInfoPage(page, " " + com.jero.modules.system.util.StringUtils.join(fieldListNew, ","), condition);
+
+		//树形数据字典
+		List<SysCategory> categoryList = this.sysCategoryService.list();
+		//过滤出树形字段
+		List<OnlCgformField> treeFieldList = fieldList.stream()
+				.filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType()))
+				.collect(Collectors.toList());
+
+
+		List<Map> records = infoPage.getRecords();
+		//数据字典
+		List<SysDictItem> sysDictItems = this.sysDictItemServiceImpl.selectItemsAll();
+		//下拉选处理数据字典
+		for (Map record : records) {
+			Map<String, Object> record1 = (Map) record;
+			String technology_territory = (String)record1.get("technology_territory");
+			for (Map.Entry<String, Object> entry : record1.entrySet()) {
+				//下拉选处理数据字典
+				this.bussDocumentLibraryEOService.dictItem(sysDictItems, entry, cut, fieldList,null);
+				this.bussDocumentLibraryEOService.treeDictItem(categoryList, entry, treeFieldList, cut,null);
+			}
+			record1.put("technology_territory_id",technology_territory);
+			String id = (String) record.get("id");
+			//根据id查询当前文档库数据是否有拆分数据。
+			QueryWrapper<SarFileSplitInfoEO> splitInfoEOQueryWrapper = new QueryWrapper<>();
+			splitInfoEOQueryWrapper.lambda().eq(SarFileSplitInfoEO::getDocumentId,id);
+			List<SarFileSplitInfoEO> sarFileSplitInfoListTemp = sarFileSplitInfoService.list(splitInfoEOQueryWrapper);
+			List<SarFileSplitInfoEO> sarFileSplitInfoList = new ArrayList<>();
+			if (CollectionUtils.isNotEmpty(sarFileSplitInfoListTemp)){
+				sarFileSplitInfoListTemp.forEach(splitInfo -> {
+					//查询出已回传的数据
+					String flag = ""; // 1 已回传   0未回传。
+					if(StringUtils.isNotEmpty(splitInfo.getFileId())){
+						flag = "1";
+						sarFileSplitInfoList.add(splitInfo);
+					}else {
+						flag = "0";
+					}
+					splitInfo.setFlag(flag);
+				});
+			}
+			record1.put("sarFileSplitInfoList",sarFileSplitInfoList);
+		}
+		return infoPage;
+	}
+
 	private String getTreeName(String cut, List<SysCategory> categoryList, List<String> technologyTerritoryList) {
 		StringBuilder sb = new StringBuilder();
 		for (String technologyTerritory : technologyTerritoryList) {

From cfd49b795e50386ece3988b20cac77a3bc8595a1 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 13 Jul 2022 11:31:02 +0800
Subject: [PATCH 039/103] =?UTF-8?q?=E5=B8=83=E5=B1=80=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

---
 jero-web/src/common/lang/en-us.js                        | 1 +
 jero-web/src/common/lang/zh-cn.js                        | 1 +
 .../views/businessSupport/technologyAssessment/index.vue | 6 +++---
 jero-web/src/views/dashboard/components/myList.vue       | 6 ++++++
 .../processCenter/processForm/processDetails/index.vue   | 2 +-
 .../processList/tabComponents/alreadyProcess/index.vue   | 3 ++-
 .../processList/tabComponents/alreadySend/index.vue      | 3 ++-
 .../processList/tabComponents/monitorProcess/index.vue   | 3 ++-
 .../processList/tabComponents/processCenter/index.vue    | 9 ++++++++-
 9 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index d6a2427e1..1540cd94c 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1124,4 +1124,5 @@ module.exports = {
   engineerFeedbackResults:'Engineer feedback results',
   fileExport:'File export',
   feedbackTime:'Feedback time',
+  regulatoryTechnologyAssessmentProcess:'Regulatory technology assessment process',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 182b67d00..77280c96f 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1128,4 +1128,5 @@ module.exports = {
   engineerFeedbackResults:'工程师反馈结果',
   fileExport:'文件导出',
   feedbackTime:'反馈时间',
+  regulatoryTechnologyAssessmentProcess:'法规技术评估流程',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
index 936c45306..eb9627cd0 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
@@ -92,10 +92,10 @@
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :columns="columns"
       >
-<!--         v-if="record.gatherResult == 'Completed'"-->
-         <span slot="operation" slot-scope="text,record">
+        <!--         -->
+        <span slot="operation" slot-scope="text,record">
            <a class="text-operation" @click="viewProcessClick(record)">{{$t('viewProcess')}}</a>
-           <a class="text-operation"
+           <a class="text-operation" v-if="record.flowStatus == 'Completed'"
               @click="evaluationResultsClick(record)">{{$t('evaluationResults')}}</a>
         </span>
       </a-table>
diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue
index 3f1f4e533..637435a0d 100644
--- a/jero-web/src/views/dashboard/components/myList.vue
+++ b/jero-web/src/views/dashboard/components/myList.vue
@@ -100,6 +100,12 @@
             query: row
           })
           window.open(newUrl.href, '_blank')
+        }else if (row.prcType == '6') {
+          let newUrl = this.$router.resolve({
+            path: '/evaluationProcess',
+            query: row
+          })
+          window.open(newUrl.href, '_blank')
         }
       }
     }
diff --git a/jero-web/src/views/processCenter/processForm/processDetails/index.vue b/jero-web/src/views/processCenter/processForm/processDetails/index.vue
index a013952f1..b249d372e 100644
--- a/jero-web/src/views/processCenter/processForm/processDetails/index.vue
+++ b/jero-web/src/views/processCenter/processForm/processDetails/index.vue
@@ -13,7 +13,7 @@
     </div>
     <div class="action-bar">
     </div>
-    <regulatoryCirculationHistory v-if="$route.query.prcType == '5'"/>
+    <regulatoryCirculationHistory v-if="$route.query.prcType == '5' || $route.query.prcType == '6'"/>
     <circulationHistory v-else/>
   </div>
 </template>
diff --git a/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue
index cacd6f524..00d243eb9 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue
@@ -51,7 +51,8 @@
         selectedRowKeys: [],
         prcTypeName: {
           1: this.$t('taskConfirmationProcess'),
-          5:this.$t('collectionOfRegulatoryOpinionsProcess')
+          5:this.$t('collectionOfRegulatoryOpinionsProcess'),
+          6:this.$t('regulatoryTechnologyAssessmentProcess')
         },
         columns: [
           {
diff --git a/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue
index a9f08e126..de39cef91 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue
@@ -52,7 +52,8 @@
         selectedRowKeys: [],
         prcTypeName: {
           1: this.$t('taskConfirmationProcess'),
-          5:this.$t('collectionOfRegulatoryOpinionsProcess')
+          5:this.$t('collectionOfRegulatoryOpinionsProcess'),
+          6:this.$t('regulatoryTechnologyAssessmentProcess')
         },
         columns: [
           {
diff --git a/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue
index 848dcfc44..5df28512c 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue
@@ -52,7 +52,8 @@
         selectedRowKeys: [],
         prcTypeName: {
           1: this.$t('taskConfirmationProcess'),
-          5:this.$t('collectionOfRegulatoryOpinionsProcess')
+          5:this.$t('collectionOfRegulatoryOpinionsProcess'),
+          6:this.$t('regulatoryTechnologyAssessmentProcess')
         },
         columns: [
           {
diff --git a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
index ce1eaeec0..8e318e4f8 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
@@ -50,7 +50,8 @@
         selectedRowKeys: [],
         prcTypeName: {
           1: this.$t('taskConfirmationProcess'),
-          5:this.$t('collectionOfRegulatoryOpinionsProcess')
+          5:this.$t('collectionOfRegulatoryOpinionsProcess'),
+          6:this.$t('regulatoryTechnologyAssessmentProcess')
         },
         columns: [
           {
@@ -168,6 +169,12 @@
             query: row
           })
           window.open(newUrl.href, '_blank')
+        } else if (row.prcType == '6') {
+          let newUrl = this.$router.resolve({
+            path: '/evaluationProcess',
+            query: row
+          })
+          window.open(newUrl.href, '_blank')
         }
       },
       onChange(page, pageSize) {

From 2680d820d94096c4abd9ec57c4ab0e80e22d5533 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 13 Jul 2022 11:37:11 +0800
Subject: [PATCH 040/103] =?UTF-8?q?=E5=B8=83=E5=B1=80=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/initiatingProcess.vue                  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
index c7156aeaf..e7cd9c853 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -199,7 +199,8 @@
         //url传参严格按照当前命名
         url: {
           seachList: 'document/bussDocumentLibraryEO/queryCondition',   //搜索字段
-          addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy'
+          addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy',
+          addModelListOne: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/queryPageDummy'
         },
         loading: false,
         JLoading: false,
@@ -322,7 +323,13 @@
           ...this.searchParmes
         }
         this.loading = true
-        postAction(this.url.addModelList, query).then((res) => {
+        let url = ''
+        if (this.$route.query.whetherTobring == '1') {
+          url = this.url.addModelListOne
+        } else {
+          url = this.url.addModelList
+        }
+        postAction(url, query).then((res) => {
           if (res.success) {
             this.dataSource = res.result.records || []
             this.total = res.result.total

From 44460051d7f69646c219e0addc5109112b96dd71 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 13 Jul 2022 14:22:15 +0800
Subject: [PATCH 041/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=9F=A5=E8=AF=A2=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E5=BA=93=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...LawsTechnologyEvaluationEOServiceImpl.java | 66 ++++++++++++-------
 1 file changed, 41 insertions(+), 25 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
index 31822ae7a..9c1ca000b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
@@ -196,6 +196,14 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 		List<String> fieldListNew = new ArrayList<>();
 		fieldListNew.add("id");
 
+		//过滤出文件字段
+		List<OnlCgformField> fileFieldList = fieldList.stream()
+				.filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType()))
+				.collect(Collectors.toList());
+		for (OnlCgformField onlCgformField : fileFieldList) {
+			fieldListQuery.add(onlCgformField.getDbFieldName());
+		}
+
 		//转时间格式
 		for (String field : fieldListQuery) {
 			String fieldTemp = null;
@@ -208,13 +216,10 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 				fieldListNew.add(fieldTemp);
 			}
 		}
-		//过滤出文件字段
-		List<OnlCgformField> fileFieldList = fieldList.stream()
-				.filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType()))
+
+		List<String> fileFieldStrList = fieldList.stream()
+				.filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).map(OnlCgformField::getDbFieldName)
 				.collect(Collectors.toList());
-		for (OnlCgformField onlCgformField : fileFieldList) {
-			fieldListNew.add(onlCgformField.getDbFieldName());
-		}
 
 		//封装查询条件
 		String condition = this.bussDocumentLibraryEOService.getConditionStr(parameter);
@@ -239,32 +244,43 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 		for (Map record : records) {
 			Map<String, Object> record1 = (Map) record;
 			String technology_territory = (String)record1.get("technology_territory");
+
+			List<String> connectIdList = new ArrayList<>();
+
 			for (Map.Entry<String, Object> entry : record1.entrySet()) {
 				//下拉选处理数据字典
 				this.bussDocumentLibraryEOService.dictItem(sysDictItems, entry, cut, fieldList,null);
 				this.bussDocumentLibraryEOService.treeDictItem(categoryList, entry, treeFieldList, cut,null);
+				if(fileFieldStrList.contains(entry.getKey())){
+					if(entry.getValue()!=null){
+						connectIdList.add(entry.getValue().toString());
+					}
+				}
 			}
 			record1.put("technology_territory_id",technology_territory);
-			String id = (String) record.get("id");
-			//根据id查询当前文档库数据是否有拆分数据。
-			QueryWrapper<SarFileSplitInfoEO> splitInfoEOQueryWrapper = new QueryWrapper<>();
-			splitInfoEOQueryWrapper.lambda().eq(SarFileSplitInfoEO::getDocumentId,id);
-			List<SarFileSplitInfoEO> sarFileSplitInfoListTemp = sarFileSplitInfoService.list(splitInfoEOQueryWrapper);
-			List<SarFileSplitInfoEO> sarFileSplitInfoList = new ArrayList<>();
-			if (CollectionUtils.isNotEmpty(sarFileSplitInfoListTemp)){
-				sarFileSplitInfoListTemp.forEach(splitInfo -> {
-					//查询出已回传的数据
-					String flag = ""; // 1 已回传   0未回传。
-					if(StringUtils.isNotEmpty(splitInfo.getFileId())){
-						flag = "1";
-						sarFileSplitInfoList.add(splitInfo);
-					}else {
-						flag = "0";
-					}
-					splitInfo.setFlag(flag);
-				});
+
+			if(CollectionUtils.isNotEmpty(connectIdList)){
+				//根据id查询当前文档库数据是否有拆分数据。
+				QueryWrapper<SarFileSplitInfoEO> splitInfoEOQueryWrapper = new QueryWrapper<>();
+				splitInfoEOQueryWrapper.lambda().in(SarFileSplitInfoEO::getConnectId,connectIdList);
+				List<SarFileSplitInfoEO> sarFileSplitInfoList = new ArrayList<>();
+
+				List<SarFileSplitInfoEO> sarFileSplitInfoListTemp = sarFileSplitInfoService.list(splitInfoEOQueryWrapper);
+				if (CollectionUtils.isNotEmpty(sarFileSplitInfoListTemp)){
+					sarFileSplitInfoListTemp.forEach(splitInfo -> {
+						//查询出已回传的数据
+						String flag = ""; // 1 已回传   0未回传。
+						if(StringUtils.isNotEmpty(splitInfo.getFileId())){
+							flag = "1";
+							sarFileSplitInfoList.add(splitInfo);
+						}else {
+							flag = "0";
+						}
+						splitInfo.setFlag(flag);
+					});
+					record1.put("sarFileSplitInfoList",sarFileSplitInfoList);
+				}
 			}
-			record1.put("sarFileSplitInfoList",sarFileSplitInfoList);
 		}
 		return infoPage;
 	}

From 002908252c311176a3a0fda351f841bcffeb03b2 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Wed, 13 Jul 2022 14:51:11 +0800
Subject: [PATCH 042/103] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9-=E5=8F=98=E6=9B=B4=EF=BC=9A=E6=B7=BB=E5=8A=A0"?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98"=E6=8E=A7=E4=BB=B6=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql | 18 ++++-
 .../entity/ParamsCollectManifestBaseEO.java   |  5 ++
 .../mapper/ParamsCollectManifestEOMapper.java | 13 ++--
 .../xml/ParamsCollectManifestEOMapper.xml     | 10 +++
 .../ParamsCollectManifestHistoryEOMapper.xml  |  2 +
 .../ParamsCollectManifestEOServiceImpl.java   | 16 ++++
 .../mapper/xml/ParamsReportDetailEOMapper.xml |  1 +
 .../cert/template/entity/ParamsInfoEO.java    |  9 ++-
 .../cert/template/enums/ControlTypeEnum.java  |  3 +-
 .../mapper/xml/ParamsInfoEOMapper.xml         |  4 +
 .../mapper/xml/ParamsInfoPublishEOMapper.xml  |  1 +
 .../service/impl/ParamsInfoEOServiceImpl.java | 76 +++++++++++++------
 .../cert/template/vo/ParamsInfoCnImport.java  |  5 ++
 .../cert/template/vo/ParamsInfoEnExport.java  |  7 +-
 .../cert/template/vo/ParamsInfoEnImport.java  |  5 ++
 jero-web/src/common/lang/en-us.js             |  2 +
 jero-web/src/common/lang/zh-cn.js             |  2 +
 .../parameterlist/components/addModel.vue     | 23 ++++++
 18 files changed, 170 insertions(+), 32 deletions(-)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index d1f370f85..f93c831d4 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -359,4 +359,20 @@ ALTER TABLE `laws_weilai`.`params_report_detail`
 
 ALTER TABLE `laws_weilai`.`report_cert_category_params_info`
     MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `params_name`;
---以上SQL 2022年7月12日 已同步正式环境
\ No newline at end of file
+--以上SQL 2022年7月12日 已同步正式环境
+
+-- 参数项清单表 添加字段 标题默认值 2022-07-13
+ALTER TABLE `laws_weilai`.`params_info`
+    ADD COLUMN `title_default_value` varchar(100) NULL COMMENT '标题默认值' AFTER `params_template_id`;
+
+ALTER TABLE `laws_weilai`.`params_info_publish`
+    ADD COLUMN `title_default_value` varchar(100) NULL COMMENT '标题默认值' AFTER `version`;
+
+ALTER TABLE `laws_weilai`.`params_collect_manifest`
+    ADD COLUMN `title_default_value` varchar(100) NULL COMMENT '标题默认值' AFTER `add_flag`;
+
+ALTER TABLE `laws_weilai`.`params_collect_manifest_history`
+    ADD COLUMN `title_default_value` varchar(100) NULL COMMENT '标题默认值' AFTER `params_manifest_id`;
+
+ALTER TABLE `laws_weilai`.`params_report_detail`
+    ADD COLUMN `title_default_value` varchar(100) NULL COMMENT '标题默认值' AFTER `sync_time`;
\ No newline at end of file
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java
index 5346caf15..8e42caf35 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java
@@ -137,4 +137,9 @@ public class ParamsCollectManifestBaseEO implements Serializable {
     @Excel(name = "参数清单id", width = 15)
     @ApiModelProperty(value = "参数清单id")
     private String paramsManifestId;
+
+    /**标题默认值*/
+    @Excel(name = "默认值", width = 15)
+    @ApiModelProperty(value = "标题默认值")
+    private String titleDefaultValue;
 }
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
index 9c04eeaa3..1e8304570 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
@@ -1,11 +1,11 @@
 package com.jero.modules.cert.collect.mapper;
 
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.ibatis.annotations.Param;
-import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @Description: 参数收集清单
@@ -17,5 +17,8 @@ public interface ParamsCollectManifestEOMapper extends BaseMapper<ParamsCollectM
 
     List<ParamsCollectManifestEO> listInfo(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO);
 
+    // 查询控件类型为 标题的 参数项
+    List<ParamsCollectManifestEO> listInfoOfTitle(@Param("paramsManifestId") String paramsManifestId);
+
     IPage pageInfo(@Param("page") IPage page, @Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO);
  }
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
index 5709b8d47..98d02ed0d 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
@@ -29,6 +29,7 @@
         <result column="change_flag" property="changeFlag" />
         <result column="del_flag" property="delFlag" />
         <result column="add_flag" property="addFlag" />
+        <result column="title_default_value" property="titleDefaultValue" />
     </resultMap>
     <sql id="BaseQuerySql">
         <where>
@@ -79,10 +80,19 @@
         order by del_flag desc, add_flag desc, change_flag desc, nio_number asc
     </select>
 
+    <select id="listInfoOfTitle" resultMap="ParamsCollectManifestEOResultMap">
+        select *
+        from params_collect_manifest
+        <include refid="BaseQuerySql"/>
+        and control_type = '11'
+        order by del_flag desc, add_flag desc, change_flag desc, nio_number asc
+    </select>
+
     <select id="pageInfo" resultMap="ParamsCollectManifestEOResultMap">
         select *
         from params_collect_manifest
         <include refid="BaseQuerySql"/>
+        and control_type != '11'
         order by del_flag desc, add_flag desc, change_flag desc, nio_number asc
     </select>
 
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 d59367314..07a93e805 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
@@ -26,6 +26,7 @@
         <result column="dre" property="dre" />
         <result column="deadline" property="deadline" />
         <result column="params_manifest_id" property="paramsManifestId" />
+        <result column="title_default_value" property="titleDefaultValue" />
     </resultMap>
     <sql id="BaseQuerySql">
         <where>
@@ -66,6 +67,7 @@
         select *
         from params_collect_manifest_history
         <include refid="BaseQuerySql"/>
+        and control_type != '11'
         order by nio_number asc
     </select>
 </mapper>
\ No newline at end of file
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index a11e3fb76..112e02295 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -1545,6 +1545,22 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			}
 		}
 
+		// 单独添加 控件类型为标题的参数项
+		if (!isSync) { // 未上报
+			List<ParamsCollectManifestEO> paramsCollectManifestEOListOfTitle = paramsCollectManifestEOMapper.listInfoOfTitle(paramsManifestId);
+			if(CollectionUtil.isNotEmpty(paramsCollectManifestEOListOfTitle)) {
+				for(ParamsCollectManifestEO item : paramsCollectManifestEOListOfTitle) {
+					ParamsReportDetailEO addReportDetailEO = new ParamsReportDetailEO();
+					BeanUtils.copyProperties(item, addReportDetailEO);
+					String reportDetailId = UUID.randomUUID().toString().replace("-","");
+					addReportDetailEO.setId(reportDetailId);
+					addReportDetailEO.setParamsManifestId(reportId);
+					addReportDetailEO.setSyncTime(syncTime);
+					addReportDetailEOList.add(addReportDetailEO);
+				}
+			}
+		}
+
 		// 复制认证类别参数
 		List<String> nioNumberList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList());
 		List<CertCategoryParamsInfoPublishEO> certCategoryParamsInfoPublishEOS = certCategoryParamsInfoPublishEOService.queryListByVersionAndNio(paramsManifestEO.getParamsTemplateId(), paramsManifestEO.getParamsTemplatePublishVersion(), nioNumberList);
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
index 819e1af14..e73cb2970 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
@@ -27,6 +27,7 @@
         <result column="deadline" property="deadline" />
         <result column="params_manifest_id" property="paramsManifestId" />
         <result column="sync_time" property="syncTime" />
+        <result column="title_default_value" property="titleDefaultValue" />
     </resultMap>
 
     <sql id="BaseQuerySql">
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java
index 548885b9d..1df1f9a2e 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java
@@ -106,7 +106,7 @@ public class ParamsInfoEO implements Serializable {
     private String certCategory;
 
 	/**控件类型*/
-    @Excel(name = "*控件类型", width = 15, replace = {"文本_1","下拉单选_2","下拉多选_3","附件_4","文本+下拉单选_5","文本+下拉多选_6","文本+附件_7","下拉单选+附件_8","下拉多选+附件_9","文本+下拉单选+附件_10"})
+    @Excel(name = "*控件类型", width = 15, replace = {"文本_1","下拉单选_2","下拉多选_3","附件_4","文本+下拉单选_5","文本+下拉多选_6","文本+附件_7","下拉单选+附件_8","下拉多选+附件_9","文本+下拉单选+附件_10","标题_11"})
     @ApiModelProperty(value = "控件类型")
     private String controlType;
 
@@ -120,7 +120,12 @@ public class ParamsInfoEO implements Serializable {
     @ApiModelProperty(value = "控件备选值")
     private String controlValues;
 
-	/**附件模板*/
+    /**标题默认值*/
+    @Excel(name = "默认值", width = 15)
+    @ApiModelProperty(value = "标题默认值")
+    private String titleDefaultValue;
+
+    /**附件模板*/
     @ApiModelProperty(value = "附件模板")
     private String fileTemplateConnectId;
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java
index 3beeb783d..9304ce180 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlTypeEnum.java
@@ -20,7 +20,8 @@ public enum ControlTypeEnum {
     TEXT_FILE("文本+附件","Text+File","7"),
     PULL_SINGLE_FILE("下拉单选+附件","Pull single+File","8"),
     PULL_MORE_FILE("下拉多选+附件","Pull more+File","9"),
-    TEXT_PULL_SINGLE_FILE("文本+下拉单选+附件","Text+Pull single+File","10");
+    TEXT_PULL_SINGLE_FILE("文本+下拉单选+附件","Text+Pull single+File","10"),
+    Title("标题","Title","11");
 
     String name;
     String enName;
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml
index 9b653f43e..7416091d5 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoEOMapper.xml
@@ -21,6 +21,7 @@
         <result column="control_verify" property="controlVerify" />
         <result column="file_template_connect_id" property="fileTemplateConnectId" />
         <result column="params_template_id" property="paramsTemplateId" />
+        <result column="title_default_value" property="titleDefaultValue" />
     </resultMap>
 
     <resultMap id="ParamsInfoEOResultMapWithCert" type="com.jero.modules.cert.template.entity.ParamsInfoEO">
@@ -43,6 +44,7 @@
         <result column="control_verify" property="controlVerify" />
         <result column="file_template_connect_id" property="fileTemplateConnectId" />
         <result column="params_template_id" property="paramsTemplateId" />
+        <result column="title_default_value" property="titleDefaultValue" />
         <collection property="certCategoryParamsInfoEOList" javaType="java.util.List" ofType="com.jero.modules.cert.template.entity.CertCategoryParamsInfoEO">
             <id column="ccpi_id" property="id" />
             <result column="ccpi_params_number" property="paramsNumber" />
@@ -74,6 +76,7 @@
         <result column="control_verify" property="controlVerify" />
         <result column="file_template_connect_id" property="fileTemplateConnectId" />
         <result column="params_template_id" property="paramsTemplateId" />
+        <result column="title_default_value" property="titleDefaultValue" />
         <collection property="certCategoryParamsInfoEnExportList" javaType="java.util.List" ofType="com.jero.modules.cert.template.vo.CertCategoryParamsInfoEnExport">
             <id column="ccpi_id" property="id" />
             <result column="ccpi_params_number" property="paramsNumber" />
@@ -105,6 +108,7 @@
         pi.control_verify as control_verify,
         pi.file_template_connect_id as file_template_connect_id,
         pi.params_template_id as params_template_id,
+        pi.title_default_value as title_default_value,
         ccpi.id as ccpi_id,
         ccpi.params_number as ccpi_params_number,
         ccpi.params_name as ccpi_params_name,
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoPublishEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoPublishEOMapper.xml
index a41f24b12..4b3361698 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoPublishEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoPublishEOMapper.xml
@@ -22,6 +22,7 @@
         <result column="file_template_connect_id" property="fileTemplateConnectId" />
         <result column="params_template_id" property="paramsTemplateId" />
         <result column="version" property="version" />
+        <result column="title_default_value" property="titleDefaultValue" />
     </resultMap>
 
     <select id="getNewestVersion" resultType="java.lang.Integer" parameterType="java.lang.String">
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
index 04a07a6a6..6230b8ec3 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
@@ -840,7 +840,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 					if (numSheet == 0) { // 企业参数表
 						if (CutEnum.EN.getValue().equals(cut)) {
 							String fields[] ={ "*NIO Number", "*Is Must", "*Params Name","*Params Batch","*Duty Territory",
-									"Description", "*Control Type", "Control Verify", "Control Values", "File Template"};
+									"Description", "*Control Type", "Control Verify", "Control Values", "Default Value", "File Template"};
 							params.setImportFields(fields);
 
 							ExcelImportResult<ParamsInfoEnImport> resultEn = ExcelImportUtil.importExcelMore(excelfile,ParamsInfoEnImport.class, params);
@@ -848,7 +848,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 							copyParamsInfoList(paramsInfoEOListEn, paramsInfoEOList);
 						} else {
 							String fields[] ={ "*NIO编号", "*是否必填", "*参数名称","*参数批次","*责任领域",
-									"参数说明", "*控件类型", "控件校验", "控件备选值", "附件模板"};
+									"参数说明", "*控件类型", "控件校验", "控件备选值", "默认值", "附件模板"};
 							params.setImportFields(fields);
 
 							ExcelImportResult<ParamsInfoCnImport> result = ExcelImportUtil.importExcelMore(excelfile, ParamsInfoCnImport.class, params);
@@ -1255,6 +1255,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 				resultMap = validateMustAndLength(controlValues, "控件备选值", "Control Values", IsMustEnum.YES.getValue(), "500", false, cut);
 			} else {
 				resultMap = validateMustAndLength(controlValues, "控件备选值", "Control Values", IsMustEnum.NO.getValue(), "500", false, cut);
+				dto.setControlValues(null);
 			}
 			errorMsg += (String)resultMap.get("errorMsg");
 			countError += (int)resultMap.get("countError");
@@ -1267,51 +1268,81 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 					|| ControlTypeEnum.TEXT_FILE.getValue().equals(controlType)
 					|| ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(controlType)) {
 				resultMap = validateMustAndLength(controlVerify, "控件校验", "Control Verify", IsMustEnum.YES.getValue(), "50", false, cut);
+
+				errorMsg += (String)resultMap.get("errorMsg");
+				countError += (int)resultMap.get("countError");
+				resultMap = getCodeByName(controlVerify,"控件校验", "Control Verify", "enum",controlVerifyEnumMap,null,null,cut);
+				errorMsg += (String)resultMap.get("errorMsg");
+				countError += (int)resultMap.get("countError");
+				controlVerify = (String)resultMap.get("value");
+				dto.setControlVerify(controlVerify);
+
 			} else {
 				resultMap = validateMustAndLength(controlVerify, "控件校验", "Control Verify", IsMustEnum.NO.getValue(), "50", false, cut);
+
+				errorMsg += (String)resultMap.get("errorMsg");
+				countError += (int)resultMap.get("countError");
+				resultMap = getCodeByName(controlVerify,"控件校验", "Control Verify", "enum",controlVerifyEnumMap,null,null,cut);
+				errorMsg += (String)resultMap.get("errorMsg");
+				countError += (int)resultMap.get("countError");
+
+				dto.setControlVerify(null);
+			}
+
+
+			// 标题默认值
+			String titleDefaultValue = dto.getTitleDefaultValue();
+			if (ControlTypeEnum.Title.getValue().equals(controlType)) {
+				resultMap = validateMustAndLength(titleDefaultValue,"默认值", "Default Value", IsMustEnum.YES.getValue(),"100",false, cut);
+			} else {
+				resultMap = validateMustAndLength(controlVerify, "默认值", "Default Value", IsMustEnum.NO.getValue(), "100", false, cut);
+				dto.setTitleDefaultValue(null);
 			}
 			errorMsg += (String)resultMap.get("errorMsg");
 			countError += (int)resultMap.get("countError");
-			resultMap = getCodeByName(controlVerify,"控件校验", "Control Verify", "enum",controlVerifyEnumMap,null,null,cut);
-			errorMsg += (String)resultMap.get("errorMsg");
-			countError += (int)resultMap.get("countError");
-			controlVerify = (String)resultMap.get("value");
-			dto.setControlVerify(controlVerify);
 
 			// 附件模板
 			String fileTemplateName = dto.getFileTemplateName();
 			if (StringUtils.isNotBlank(fileTemplateName)) {
 				StringBuilder sb = new StringBuilder();
-				fileTemplateName = fileTemplateName.replace("，",",");
+				fileTemplateName = fileTemplateName.replace("，", ",");
 				if (fileTemplateName.contains(",")) {
-					if(CutEnum.CN.getValue().equals(cut)) {
+					if (CutEnum.CN.getValue().equals(cut)) {
 						errorMsg += "附件模板只能上传一个文件;";
 					} else {
 						errorMsg += "File template only can upload one;";
 					}
 				}
 				for (String fileName : fileTemplateName.split(",")) {
-					List<File> nowFileList = FileUnZip.readFileByFilename(filepath, fileName,null,null,null,null,null);
+					List<File> nowFileList = FileUnZip.readFileByFilename(filepath, fileName, null, null, null, null, null);
 //					List<File> nowFileList = FileUnZip.readFileByFilename(filepath, fileName);
 					if (nowFileList.size() == 0) {
-						if(CutEnum.CN.getValue().equals(cut)) {
+						if (CutEnum.CN.getValue().equals(cut)) {
 							errorMsg += "附件模板压缩包中没有" + fileName + "文件; ";
 						} else {
 							errorMsg += "File template " + fileName + "isn't present in the cabinet;";
 						}
 						countError++;
 					} else {
-						try {
-							FileInputStream input = new FileInputStream(nowFileList.get(0));
-							MultipartFile multipartFile =
-									new MockMultipartFile(nowFileList.get(0).getName(), nowFileList.get(0).getName(), "text/plain", input);
-							//文件存入文件表
-							OSSFile ossFile = ossFileService.uploadLocalOfCos(multipartFile, "", null,null);
-							if (ObjectUtils.isNotEmpty(ossFile)) {
-								sb.append(ossFile.getId() + ",");
+						if (ControlTypeEnum.FILE.getValue().equals(controlType)
+								|| ControlTypeEnum.PULL_MORE_FILE.getValue().equals(controlType)
+								|| ControlTypeEnum.PULL_SINGLE_FILE.getValue().equals(controlType)
+								|| ControlTypeEnum.TEXT_FILE.getValue().equals(controlType)
+								|| ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(controlType)) {
+							try {
+								FileInputStream input = new FileInputStream(nowFileList.get(0));
+								MultipartFile multipartFile =
+										new MockMultipartFile(nowFileList.get(0).getName(), nowFileList.get(0).getName(), "text/plain", input);
+								//文件存入文件表
+								OSSFile ossFile = ossFileService.uploadLocalOfCos(multipartFile, "", null, null);
+								if (ObjectUtils.isNotEmpty(ossFile)) {
+									sb.append(ossFile.getId() + ",");
+								}
+							} catch (IOException e) {
+								e.printStackTrace();
 							}
-						} catch (IOException e) {
-							e.printStackTrace();
+						} else {
+							dto.setFileTemplateName(null);
 						}
 					}
 				}
@@ -1321,6 +1352,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 					dto.setFileTemplateName(fileTemplateId);
 				}
 			}
+
 			if (countError > 0) {
 				stringMessage.add(errorMsg);
 			}
@@ -1513,7 +1545,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 			if(CutEnum.CN.getValue().equals(cut)) {
 				errorMsg += fieldNameCn + "不能超过" + dbLength + "个字符；";
 			} else {
-				errorMsg += fieldNameEn + " can not be more than" + dbLength + "char;";
+				errorMsg += fieldNameEn + " can not be more than " + dbLength + " char;";
 			}
 			countError++;
 		}
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java
index d8624da4c..c199e293b 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java
@@ -67,6 +67,11 @@ public class ParamsInfoCnImport {
     @ApiModelProperty(value = "控件备选值")
     private String controlValues;
 
+    /**标题默认值*/
+    @Excel(name = "默认值", width = 15)
+    @ApiModelProperty(value = "标题默认值")
+    private String titleDefaultValue;
+
     /**附件模板*/
     @ApiModelProperty(value = "附件模板")
     private String fileTemplateConnectId;
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java
index 2e212bda7..575b7b5fa 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java
@@ -89,7 +89,7 @@ public class ParamsInfoEnExport {
     private String certCategory;
 
     /**控件类型*/
-    @Excel(name = "*Control Type", width = 15, replace = {"Text_1","Pull single_2","Pull more_3","File_4","Text+Pull single_5","Text+Pull more_6","Text+File_7","Pull single+File_8","Pull more+File_9","Text+Pull single+File_10"})
+    @Excel(name = "*Control Type", width = 15, replace = {"Text_1","Pull single_2","Pull more_3","File_4","Text+Pull single_5","Text+Pull more_6","Text+File_7","Pull single+File_8","Pull more+File_9","Text+Pull single+File_10","Title_11"})
     @ApiModelProperty(value = "控件类型")
     private String controlType;
 
@@ -103,6 +103,11 @@ public class ParamsInfoEnExport {
     @ApiModelProperty(value = "控件备选值")
     private String controlValues;
 
+    /**标题默认值*/
+    @Excel(name = "Default Value", width = 15)
+    @ApiModelProperty(value = "标题默认值")
+    private String titleDefaultValue;
+
     /**附件模板*/
     @ApiModelProperty(value = "附件模板")
     private String fileTemplateConnectId;
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java
index 982494a01..30f161539 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java
@@ -67,6 +67,11 @@ public class ParamsInfoEnImport {
     @ApiModelProperty(value = "控件备选值")
     private String controlValues;
 
+    /**标题默认值*/
+    @Excel(name = "Default Value", width = 15)
+    @ApiModelProperty(value = "标题默认值")
+    private String titleDefaultValue;
+
     /**附件模板*/
     @ApiModelProperty(value = "附件模板")
     private String fileTemplateConnectId;
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 1540cd94c..7d5120366 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1055,6 +1055,7 @@ module.exports = {
   NcontrolType: 'Control Type',
   NcontrolVerification: 'Control Verify',
   NcontrolAlternatives: 'Control Values',
+  DefaultValue: 'Default Value',
   NattachmentTemplate: 'File Template',
   Ntext: 'Text',
   NDropdownradio: 'Pull single',
@@ -1066,6 +1067,7 @@ module.exports = {
   Dtext: 'Pull single+File',
   Etext: 'Pull more+File',
   Ftext: 'Text+Pull single+File',
+  Gtext: 'Title',
   Nnothing: 'Null',
   Nchinese: 'Chinese',
   NpositiveInteger: 'Integer',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 77280c96f..5e8ef43d5 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1065,6 +1065,7 @@ module.exports = {
   NcontrolType: '控件类型',
   NcontrolVerification: '控件校验',
   NcontrolAlternatives: '控件备选值',
+  DefaultValue: '默认值',
   NattachmentTemplate: '附件模板',
   Ntext: '文本',
   NDropdownradio: '下拉单选',
@@ -1076,6 +1077,7 @@ module.exports = {
   Dtext: '下拉单选+附件',
   Etext:'下拉多选+附件',
   Ftext: '文本+下拉单选+附件',
+  Gtext: '标题',
   Nnothing: '无',
   Nchinese: '中文',
   NpositiveInteger: '整数',
diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index e1f29c840..d04ec6657 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -191,6 +191,22 @@
                 </a-form-model-item>
               </div>
             </a-col>
+            <a-col :span="12" v-if='this.formInline.controlType =="11"'>
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text"
+                        :title="$t('DefaultValue')">{{$t('DefaultValue')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="titleDefaultValue">
+                  <a-input class="box-input add-input"
+                           :disabled="disabled"
+                           :maxlength="100"
+                           v-model="formInline.titleDefaultValue"
+                           :placeholder="$t('PleaseEnter')+$t('DefaultValue')"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
           </a-row>
 <!--          控件备选值-->
           <a-row :gutter="24">
@@ -210,6 +226,8 @@
                 </a-form-model-item>
               </div>
             </a-col>
+
+
 <!--          附件模板-->
             <a-col :span="12" v-if='this.formInline.controlType =="4" || this.formInline.controlType =="7" || this.formInline.controlType =="8" || this.formInline.controlType =="9" || this.formInline.controlType =="10"'>
               <div class="box-title-text">
@@ -332,6 +350,7 @@ export default {
         {value:'8', label: this.$t('Dtext') },
         {value:'9', label: this.$t('Etext') },
         {value:'10', label: this.$t('Ftext') },
+        {value:'11', label: this.$t('Gtext') },
       ],
       controlVerification: [ // 控件校验
         {value:'1', label: this.$t('Nnothing') },
@@ -391,6 +410,10 @@ export default {
           { required: true, message: this.$t('PleaseEnter')+this.$t('controlAlternatives'), trigger: 'blur' },
           { min:1, max: 500, message: this.$t('cantExeed')+'500'+this.$t('characters'), trigger: 'blur' },
         ],
+        titleDefaultValue: [
+          { required: true, message: this.$t('PleaseEnter')+this.$t('DefaultValue'), trigger: 'blur' },
+          { min:1, max: 100, message: this.$t('cantExeed')+'100'+this.$t('characters'), trigger: 'blur' },
+        ],
       },
       rulesItem: {
         paramsNumber: [

From 2def5a720a86aa9ed8bba98dfb93aab8ae01a4e3 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 13 Jul 2022 14:55:28 +0800
Subject: [PATCH 043/103] =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsTechnologyEvaluationEOController.java |   8 ++
 .../ILawsTechnologyEvaluationEOService.java   |   5 +
 ...LawsTechnologyEvaluationEOServiceImpl.java | 104 ++++++++++++++++++
 3 files changed, 117 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
index 8d18a4a05..bf0a2bf79 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
@@ -16,6 +16,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -193,4 +194,11 @@ public class LawsTechnologyEvaluationEOController extends JeroController<LawsTec
 		 net.sf.json.JSONObject jsonResult = net.sf.json.JSONObject.fromObject(ok);
 		 return jsonResult;
 	 }
+
+	 @AutoLog(value = "条款导入模板下载")
+	 @ApiOperation(value = "条款导入模板下载")
+	 @GetMapping(value = "/exportItemTemplate")
+	 public void exportItemTemplate(@RequestParam(name = "cut") String cut, HttpServletResponse response, HttpServletRequest request) throws Exception {
+		 this.lawsTechnologyEvaluationEOService.exportItemTemplate(cut,response,request);
+	 }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java
index ad017a213..6692885a1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java
@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.common.api.vo.Result;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO;
 import com.baomidou.mybatisplus.extension.service.IService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -78,4 +81,6 @@ public interface ILawsTechnologyEvaluationEOService extends IService<LawsTechnol
 	void disposeData(List<LawsTechnologyEvaluationEO> records, String cut);
 
     IPage getPageDummy(Map<String, Object> parameter);
+
+	void exportItemTemplate(String cut, HttpServletResponse response, HttpServletRequest request);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
index 9c1ca000b..c55596370 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
@@ -6,9 +6,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
+import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.constant.enums.ModuleEnum;
+import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.util.TokenUtils;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
 import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
 import com.jero.modules.document.enums.FieldTypeEnum;
@@ -19,23 +22,45 @@ import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluation
 import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationEOMapper;
 import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService;
 import com.jero.modules.project.enums.OperatorTypeEnum;
+import com.jero.modules.project.enums.ProjectInventoryFieldEnum;
 import com.jero.modules.project.enums.RequestSourceEnum;
 import com.jero.modules.split.entity.SarFileSplitInfoEO;
 import com.jero.modules.split.service.ISarFileSplitInfoService;
 import com.jero.modules.system.entity.SysCategory;
+import com.jero.modules.system.entity.SysCategoryTreeVO;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFRichTextString;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
+import org.apache.poi.xssf.usermodel.XSSFRichTextString;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.io.File;
+import java.io.OutputStream;
 import java.util.*;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * @Description: 法规技术评估
  * @Author: jero-boot
@@ -57,6 +82,8 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 	private SysDictItemServiceImpl sysDictItemServiceImpl;
 	@Autowired
 	private ISarFileSplitInfoService sarFileSplitInfoService;
+	@Value(value = "${jero.path.upload}")
+	private String uploadpath;
 
 	/**
 	 * 保存
@@ -285,6 +312,83 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 		return infoPage;
 	}
 
+	@Override
+	public void exportItemTemplate(String cut, HttpServletResponse response, HttpServletRequest request) {
+		//验证token
+//		String token = request.getHeader("X-Access-Token");
+//		TokenUtils.verifyToken(token, sysBaseAPI, redisUtil);
+
+		OutputStream os = null;
+		HSSFWorkbook workbook = new HSSFWorkbook();
+		String fileOriName = "";
+		String filePath = uploadpath + File.separator + fileOriName;
+		try {
+			String titleOne = "";
+			if (CutEnum.CN.getValue().equals(cut)) {
+				titleOne = "条款号,条款名称,条款内容";
+				fileOriName = "条款信息导入模板.xls";
+			} else {
+				titleOne = "Item num,Item name,Item Contents";
+				fileOriName = "Item information is imported into the template.xls";
+			}
+
+			//创建临时文件夹
+			File nowFile = new File(filePath);
+			if (nowFile.exists()) {
+				nowFile.delete();
+			}
+			nowFile.mkdirs();
+
+			HSSFSheet sheet = workbook.createSheet("sheet1");
+			sheet.setDefaultColumnWidth(16);//列宽
+			HSSFCellStyle cellStyle = workbook.createCellStyle();
+			cellStyle.setWrapText(true);//自动换行
+			cellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中
+			cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//水平居中
+
+			HSSFCellStyle cellStyleTemp = workbook.createCellStyle();
+			cellStyleTemp.setWrapText(true);//自动换行
+
+			int startLine = 0;
+			int endLine = 4;
+			//合并单元格
+			CellRangeAddress region1 =
+					new CellRangeAddress(1, 1, startLine, endLine); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
+			sheet.addMergedRegion(region1);
+
+			String explainInfo = null;
+
+			HSSFRichTextString explain = new HSSFRichTextString(explainInfo);
+
+			//表头
+			Row row = sheet.createRow(0);//开始创建标题行
+			String[] headerArr = titleOne.split(",");
+			for (int m = 0; m < headerArr.length; m++) {
+				row.createCell(m).setCellValue(headerArr[m]);
+			}
+
+			Row rowExplain = sheet.createRow(1);
+			short height = (short) (7 * 200);
+			rowExplain.setHeight((short) height);
+			Cell cell = rowExplain.createCell(0);
+			cell.setCellValue(explain);
+			cell.setCellStyle(cellStyleTemp);
+
+			response.setHeader("Content-Disposition",
+					"attachment; filename=\"" + fileOriName + ".xls");
+			response.setContentType("application/force-download");
+			response.flushBuffer();
+			os = response.getOutputStream();
+			workbook.write(os);
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new JeroBootException("下载文件失败，请重试");
+		} finally {
+			IOUtils.closeQuietly(os);
+		}
+
+	}
+
 	private String getTreeName(String cut, List<SysCategory> categoryList, List<String> technologyTerritoryList) {
 		StringBuilder sb = new StringBuilder();
 		for (String technologyTerritory : technologyTerritoryList) {

From e4dc5d972374dd8eeb9b54f36e92d112493c73b8 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Wed, 13 Jul 2022 15:27:14 +0800
Subject: [PATCH 044/103] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E5=8C=85=E6=96=87=E4=BB=B6=E5=A4=B9=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E4=B8=8D=E5=87=86=E7=A1=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jero/modules/split/common/FileUnZip.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
index 6b49c5eca..bd676b932 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
@@ -198,7 +198,7 @@ public class FileUnZip {
                         File[] filesTemp = fi.listFiles();
                         for (File fileTemp : filesTemp) {
                             // 对文件进行过滤
-                            if (fileTemp.getName().equals(filenameTwo) && fileTemp.getPath().contains(filenameOne) && StringUtils.isNotBlank(filenameOne)) {
+                            if (fileTemp.getName().equals(filenameTwo) && fi.getName().equals(filenameOne) && StringUtils.isNotBlank(filenameOne)) {
                                 resultlist.add(fileTemp);
                             }
                         }

From d4d359dc6baa39adeae89f5cc6f5f2b988f7a3b5 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Wed, 13 Jul 2022 15:40:18 +0800
Subject: [PATCH 045/103] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9-=E5=8F=98=E6=9B=B4=EF=BC=9A=E6=B7=BB=E5=8A=A0"?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98"=E6=8E=A7=E4=BB=B6=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
index 98d02ed0d..873d1399a 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
@@ -83,8 +83,7 @@
     <select id="listInfoOfTitle" resultMap="ParamsCollectManifestEOResultMap">
         select *
         from params_collect_manifest
-        <include refid="BaseQuerySql"/>
-        and control_type = '11'
+        where params_manifest_id = #{paramsManifestId} and control_type = '11'
         order by del_flag desc, add_flag desc, change_flag desc, nio_number asc
     </select>
 

From a813e55f098571db79d7a00658c4484c29d2b714 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 13 Jul 2022 15:43:48 +0800
Subject: [PATCH 046/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=B5=81=E7=A8=8B=E5=AF=B9=E6=8E=A5?=
 =?UTF-8?q?=E3=80=82=E3=80=82=20=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E5=AF=BC=E5=85=A5=E6=9D=A1=E6=AC=BE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsTechnologyEvaluationEOController.java |  9 +++
 ...echnologyEvaluationResultEOController.java |  5 +-
 .../LawsTechnologyEvaluationResultEO.java     |  5 --
 .../ILawsTechnologyEvaluationEOService.java   |  3 +
 ...wsTechnologyEvaluationResultEOService.java |  5 +-
 ...LawsTechnologyEvaluationEOServiceImpl.java | 68 +++++++++++++------
 ...chnologyEvaluationResultEOServiceImpl.java | 13 +++-
 7 files changed, 76 insertions(+), 32 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
index bf0a2bf79..747a2c2f5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
@@ -20,6 +20,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -201,4 +202,12 @@ public class LawsTechnologyEvaluationEOController extends JeroController<LawsTec
 	 public void exportItemTemplate(@RequestParam(name = "cut") String cut, HttpServletResponse response, HttpServletRequest request) throws Exception {
 		 this.lawsTechnologyEvaluationEOService.exportItemTemplate(cut,response,request);
 	 }
+
+	 @AutoLog(value = "条款导入")
+	 @ApiOperation(value = "条款导入")
+	 @GetMapping(value = "/importItemExcel")
+	 public List<Map<String,Object>> importItemExcel(MultipartFile file, @RequestParam(name = "cut") String cut, HttpServletRequest request) throws Exception {
+		 List<Map<String,Object>> result = this.lawsTechnologyEvaluationEOService.importItemExcel(file,cut,request);
+		 return result;
+	 }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java
index 7dc83916c..3b91ded39 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java
@@ -68,8 +68,9 @@ public class LawsTechnologyEvaluationResultEOController extends JeroController<L
 	@AutoLog(value = "法规技术评估-评估结果表-列表查询")
     @ApiOperation(value="法规技术评估-评估结果表-列表查询", notes="法规技术评估-评估结果表-列表查询")
 	@GetMapping(value = "/list")
-	public Result<List<LawsTechnologyEvaluationResultEO>> queryList() {
-        List<LawsTechnologyEvaluationResultEO> list = lawsTechnologyEvaluationResultEOService.queryList();
+	public Result<List<LawsTechnologyEvaluationResultEO>> queryList(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO,
+																	HttpServletRequest req) {
+        List<LawsTechnologyEvaluationResultEO> list = lawsTechnologyEvaluationResultEOService.queryList(lawsTechnologyEvaluationResultEO,req);
         return Result.OK(list);
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java
index 1777b8396..15b4a7998 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java
@@ -1,8 +1,6 @@
 package com.jero.modules.lawsTechnologyEvaluation.entity;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -10,13 +8,10 @@ import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
 
 /**
  * @Description: 法规技术评估-评估结果表
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java
index 6692885a1..5c4cd6ce8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.common.api.vo.Result;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -83,4 +84,6 @@ public interface ILawsTechnologyEvaluationEOService extends IService<LawsTechnol
     IPage getPageDummy(Map<String, Object> parameter);
 
 	void exportItemTemplate(String cut, HttpServletResponse response, HttpServletRequest request);
+
+	List<Map<String,Object>> importItemExcel(MultipartFile file, String cut, HttpServletRequest request)throws Exception;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java
index a1ab5e08c..e7f842c8c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java
@@ -3,6 +3,8 @@ package com.jero.modules.lawsTechnologyEvaluation.service;
 import com.alibaba.fastjson.JSONObject;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO;
 import com.baomidou.mybatisplus.extension.service.IService;
+
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -58,7 +60,8 @@ public interface ILawsTechnologyEvaluationResultEOService extends IService<LawsT
 	 *
 	 * @return
 	 */
-    List<LawsTechnologyEvaluationResultEO> queryList();
+    List<LawsTechnologyEvaluationResultEO> queryList(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO,
+													 HttpServletRequest req);
 
 	/**
 	 * 评估人保存/提交
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
index c55596370..e530159eb 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
@@ -1,17 +1,13 @@
 package com.jero.modules.lawsTechnologyEvaluation.service.impl;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
-import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.constant.enums.ModuleEnum;
-import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
-import com.jero.common.util.TokenUtils;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
 import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
 import com.jero.modules.document.enums.FieldTypeEnum;
@@ -22,12 +18,10 @@ import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluation
 import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationEOMapper;
 import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService;
 import com.jero.modules.project.enums.OperatorTypeEnum;
-import com.jero.modules.project.enums.ProjectInventoryFieldEnum;
 import com.jero.modules.project.enums.RequestSourceEnum;
 import com.jero.modules.split.entity.SarFileSplitInfoEO;
 import com.jero.modules.split.service.ISarFileSplitInfoService;
 import com.jero.modules.system.entity.SysCategory;
-import com.jero.modules.system.entity.SysCategoryTreeVO;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
@@ -38,15 +32,8 @@ import org.apache.poi.hssf.usermodel.HSSFCellStyle;
 import org.apache.poi.hssf.usermodel.HSSFRichTextString;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
-import org.apache.poi.xssf.usermodel.XSSFRichTextString;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -57,6 +44,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -314,21 +302,17 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 
 	@Override
 	public void exportItemTemplate(String cut, HttpServletResponse response, HttpServletRequest request) {
-		//验证token
-//		String token = request.getHeader("X-Access-Token");
-//		TokenUtils.verifyToken(token, sysBaseAPI, redisUtil);
-
 		OutputStream os = null;
 		HSSFWorkbook workbook = new HSSFWorkbook();
 		String fileOriName = "";
 		String filePath = uploadpath + File.separator + fileOriName;
 		try {
-			String titleOne = "";
+			String title = "";
 			if (CutEnum.CN.getValue().equals(cut)) {
-				titleOne = "条款号,条款名称,条款内容";
+				title = "条款号,条款名称,条款内容";
 				fileOriName = "条款信息导入模板.xls";
 			} else {
-				titleOne = "Item num,Item name,Item Contents";
+				title = "Item num,Item name,Item Contents";
 				fileOriName = "Item information is imported into the template.xls";
 			}
 
@@ -362,7 +346,7 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 
 			//表头
 			Row row = sheet.createRow(0);//开始创建标题行
-			String[] headerArr = titleOne.split(",");
+			String[] headerArr = title.split(",");
 			for (int m = 0; m < headerArr.length; m++) {
 				row.createCell(m).setCellValue(headerArr[m]);
 			}
@@ -389,6 +373,46 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 
 	}
 
+	@Override
+	public List<Map<String,Object>> importItemExcel(MultipartFile file, String cut, HttpServletRequest request)throws Exception {
+		//校验文件格式
+		int pos = file.getOriginalFilename().lastIndexOf(".");
+		String fileSuffixStr = file.getOriginalFilename().substring(pos+1).toLowerCase();
+		if(!StringUtils.equals(fileSuffixStr,"xls")){
+			if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+				throw new JeroBootException("请上传xls文件");
+			}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+				throw new JeroBootException("Please upload a xls file");
+			}
+		}
+		String fileName = file.getOriginalFilename();
+
+		List<Map<String, Object>> result = new ArrayList<>();
+
+		File excelFile = File.createTempFile(fileName, fileSuffixStr);
+		file.transferTo(excelFile);
+		Workbook workbook = WorkbookFactory.create(excelFile);
+		if (workbook != null) {
+			Sheet sheet = workbook.getSheetAt(0);
+			if (sheet != null) {
+				int rowNos = sheet.getPhysicalNumberOfRows();// 得到excel的总记录条数
+				for (int i = 0; i < rowNos ; i++) {
+					Row row = sheet.getRow(i + 1);
+
+					String itemNum = row.getCell(0, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
+					String itemName = row.getCell(1, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
+					String itemContents = row.getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
+					Map<String,Object> itemInfoMap = new HashMap<>();
+					itemInfoMap.put("itemNum",itemNum);
+					itemInfoMap.put("itemName",itemName);
+					itemInfoMap.put("itemContent",itemContents);
+					result.add(itemInfoMap);
+				}
+			}
+		}
+		return result;
+	}
+
 	private String getTreeName(String cut, List<SysCategory> categoryList, List<String> technologyTerritoryList) {
 		StringBuilder sb = new StringBuilder();
 		for (String technologyTerritory : technologyTerritoryList) {
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java
index 21a4f9974..0a8d9dd7f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java
@@ -3,6 +3,7 @@ package com.jero.modules.lawsTechnologyEvaluation.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO;
 import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationResultEOMapper;
@@ -17,6 +18,8 @@ import java.util.List;
 import java.util.Date;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @Description: 法规技术评估-评估结果表
  * @Author: jero-boot
@@ -95,8 +98,11 @@ public class LawsTechnologyEvaluationResultEOServiceImpl extends ServiceImpl<Law
 	 * @return
 	 */
 	@Override
-    public List<LawsTechnologyEvaluationResultEO> queryList() {
-        return list();
+    public List<LawsTechnologyEvaluationResultEO> queryList(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO,
+															HttpServletRequest req) {
+		QueryWrapper<LawsTechnologyEvaluationResultEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationResultEO, req.getParameterMap());
+		List<LawsTechnologyEvaluationResultEO> evaluationResultEOList = this.baseMapper.selectList(queryWrapper);
+		return evaluationResultEOList;
     }
 
 	@Override
@@ -129,6 +135,9 @@ public class LawsTechnologyEvaluationResultEOServiceImpl extends ServiceImpl<Law
 		LawsTechnologyEvaluationResultEO evaluationResultEO = null;
 		for (Object evaluationResult : evaluationResultList) {
 			evaluationResultEO = JSONObject.parseObject(JSONObject.toJSONString(evaluationResult),LawsTechnologyEvaluationResultEO.class);
+			evaluationResultEO.setActiProcInstId(actiProcInstId);
+			evaluationResultEO.setLawsTechnologyEvaluationId(lawsTechnologyEvaluationId);
+			evaluationResultEO.setSubmitTime(new Date());
 			evaluationResultEOList.add(evaluationResultEO);
 		}
 		if(CollectionUtils.isNotEmpty(evaluationResultEOList)){

From cb8b7e583f922b53a17f3ccb65334d453df22476 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 13 Jul 2022 15:45:35 +0800
Subject: [PATCH 047/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=9D=A1=E6=AC=BE=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0itemId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LawsTechnologyEvaluationEOServiceImpl.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
index e530159eb..b2c091f39 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
@@ -403,6 +403,8 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 					String itemName = row.getCell(1, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
 					String itemContents = row.getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
 					Map<String,Object> itemInfoMap = new HashMap<>();
+					String itemId = UUID.randomUUID().toString().replace("-", "");
+					itemInfoMap.put("itemId",itemId);
 					itemInfoMap.put("itemNum",itemNum);
 					itemInfoMap.put("itemName",itemName);
 					itemInfoMap.put("itemContent",itemContents);

From 1bff3449b78a7504e8085110453f9ec1f5789ab1 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 13 Jul 2022 15:59:04 +0800
Subject: [PATCH 048/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=B5=81=E7=A8=8B=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E8=AF=84=E4=BC=B0=E4=BA=BA=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ologyEvaluationFlowDetailEOController.java |  2 +
 .../LawsTechnologyEvaluationFlowDetailEO.java |  4 ++
 ...chnologyEvaluationFlowDetailEOService.java |  7 ++++
 ...logyEvaluationFlowDetailEOServiceImpl.java | 42 +++++++++++++++++++
 4 files changed, 55 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java
index 499b50d43..3605e81cc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationFlowDetailEOController.java
@@ -53,10 +53,12 @@ public class LawsTechnologyEvaluationFlowDetailEOController extends JeroControll
 	public Result<?> queryPageList(LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   @RequestParam(name="cut", defaultValue="cn") String cut,
 								   HttpServletRequest req) {
 		QueryWrapper<LawsTechnologyEvaluationFlowDetailEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationFlowDetailEO, req.getParameterMap());
 		Page<LawsTechnologyEvaluationFlowDetailEO> page = new Page<LawsTechnologyEvaluationFlowDetailEO>(pageNo, pageSize);
 		IPage<LawsTechnologyEvaluationFlowDetailEO> pageList = lawsTechnologyEvaluationFlowDetailEOService.page(page, queryWrapper);
+		this.lawsTechnologyEvaluationFlowDetailEOService.disposeData(pageList.getRecords(),cut);
 		return Result.OK(pageList);
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationFlowDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationFlowDetailEO.java
index 8178c3dfb..954586eaa 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationFlowDetailEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationFlowDetailEO.java
@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -86,4 +87,7 @@ public class LawsTechnologyEvaluationFlowDetailEO implements Serializable {
     @ApiModelProperty(value = "评估人id")
     private java.lang.String evaluatorId;
 
+    @TableField(exist = false)
+    private String evaluatorName;
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationFlowDetailEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationFlowDetailEOService.java
index 89af12bd5..f190d574d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationFlowDetailEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationFlowDetailEOService.java
@@ -67,4 +67,11 @@ public interface ILawsTechnologyEvaluationFlowDetailEOService extends IService<L
 	 * @return
 	 */
     Result<?> processCall(JSONObject jsonObject);
+
+	/**
+	 * 处理数据
+	 * @param datas
+	 * @param cut
+	 */
+    void disposeData(List<LawsTechnologyEvaluationFlowDetailEO> datas, String cut);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java
index dbf699f42..fa247a532 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java
@@ -9,13 +9,18 @@ import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluation
 import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationFlowDetailEOService;
 import com.jero.modules.project.enums.OperatorTypeEnum;
 import com.jero.modules.project.enums.RequestSourceEnum;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.service.ISysUserService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Date;
+import java.util.stream.Collectors;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
@@ -27,6 +32,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class LawsTechnologyEvaluationFlowDetailEOServiceImpl extends ServiceImpl<LawsTechnologyEvaluationFlowDetailEOMapper, LawsTechnologyEvaluationFlowDetailEO> implements ILawsTechnologyEvaluationFlowDetailEOService {
 
+	@Autowired
+	private ISysUserService sysUserService;
+
 	/**
 	 * 保存
 	 *
@@ -126,4 +134,38 @@ public class LawsTechnologyEvaluationFlowDetailEOServiceImpl extends ServiceImpl
 
 		return new Result<>().success("调用成功！");
 	}
+
+	@Override
+	public void disposeData(List<LawsTechnologyEvaluationFlowDetailEO> datas, String cut) {
+		if(CollectionUtils.isNotEmpty(datas)){
+			List<String> userIdList = new ArrayList<>();
+			for (LawsTechnologyEvaluationFlowDetailEO data : datas) {
+				String evaluatorId = data.getEvaluatorId();
+				if(StringUtils.isNotEmpty(evaluatorId)){
+					userIdList.add(evaluatorId);
+				}
+			}
+			List<SysUser> sysUserList = new ArrayList<>();
+			if(CollectionUtils.isNotEmpty(userIdList)){
+				sysUserList = sysUserService.querySysUserListByIdList(userIdList);
+			}
+
+			for (LawsTechnologyEvaluationFlowDetailEO data : datas) {
+				if(CollectionUtils.isNotEmpty(sysUserList)){
+					String evaluatorId = data.getEvaluatorId();
+					if(StringUtils.isNotEmpty(evaluatorId)){
+						String evaluatorName = sysUserList.stream().filter(sysUser -> {
+							boolean flag = false;
+							if (StringUtils.equals(sysUser.getId(), data.getEvaluatorId())) {
+								flag = true;
+							}
+							return flag;
+						}).map(SysUser::getUsername).distinct().collect(Collectors.joining(","));
+						data.setEvaluatorName(evaluatorName);
+					}
+				}
+			}
+
+		}
+	}
 }

From e8c88e0de32f8708eb83677e32a75dc3297d51ac Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 13 Jul 2022 16:04:07 +0800
Subject: [PATCH 049/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E3=80=81=E6=84=8F=E8=A7=81=E6=94=B6=E9=9B=86?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=B8=9A=E5=8A=A1=E5=B1=82=E5=8A=A0=E4=BA=8B?=
 =?UTF-8?q?=E5=8A=A1=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsTechnologyEvaluationComplianceResultEOServiceImpl.java | 3 +++
 .../service/impl/LawsTechnologyEvaluationEOServiceImpl.java    | 3 +++
 .../impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java  | 3 +++
 .../impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java  | 3 +++
 .../impl/LawsTechnologyEvaluationResultEOServiceImpl.java      | 3 +++
 5 files changed, 15 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java
index 8f8397d0c..16849cd96 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java
@@ -7,6 +7,8 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.Date;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @Description: 法规技术评估-评估人反馈-符合性结果表
@@ -15,6 +17,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * @Version: V1.0
  */
 @Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
 public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends ServiceImpl<LawsTechnologyEvaluationComplianceResultEOMapper, LawsTechnologyEvaluationComplianceResultEO> implements ILawsTechnologyEvaluationComplianceResultEOService {
 
 	/**
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
index b2c091f39..08d0b962b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
@@ -44,6 +44,8 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
@@ -56,6 +58,7 @@ import javax.servlet.http.HttpServletResponse;
  * @Version: V1.0
  */
 @Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
 public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechnologyEvaluationEOMapper, LawsTechnologyEvaluationEO> implements ILawsTechnologyEvaluationEOService {
 
 	@Autowired
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java
index fa247a532..fb5429b62 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java
@@ -22,6 +22,8 @@ import java.util.Date;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @Description: 法规技术评估表-流程明细
@@ -30,6 +32,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * @Version: V1.0
  */
 @Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
 public class LawsTechnologyEvaluationFlowDetailEOServiceImpl extends ServiceImpl<LawsTechnologyEvaluationFlowDetailEOMapper, LawsTechnologyEvaluationFlowDetailEO> implements ILawsTechnologyEvaluationFlowDetailEOService {
 
 	@Autowired
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java
index 9f2fdc9f1..9980664e8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java
@@ -18,6 +18,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Date;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @Description: 法规技术评估-条款信息评估结果表
@@ -26,6 +28,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * @Version: V1.0
  */
 @Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
 public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl<LawsTechnologyEvaluationItemResultEOMapper, LawsTechnologyEvaluationItemResultEO> implements ILawsTechnologyEvaluationItemResultEOService {
 
 	/**
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java
index 0a8d9dd7f..221725daa 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java
@@ -17,6 +17,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Date;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -27,6 +29,7 @@ import javax.servlet.http.HttpServletRequest;
  * @Version: V1.0
  */
 @Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
 public class LawsTechnologyEvaluationResultEOServiceImpl extends ServiceImpl<LawsTechnologyEvaluationResultEOMapper, LawsTechnologyEvaluationResultEO> implements ILawsTechnologyEvaluationResultEOService {
 
 	@Autowired

From 8dac0ed7f9c1026ddfaf2410100758051044748c Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 13 Jul 2022 16:16:06 +0800
Subject: [PATCH 050/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E5=A2=9E=E5=8A=A0=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E6=80=A7=E7=BB=93=E6=9E=9C=E6=9E=9A=E4=B8=BE=E7=B1=BB=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enums/ComplianceResultEnum.java           | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/ComplianceResultEnum.java

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/ComplianceResultEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/ComplianceResultEnum.java
new file mode 100644
index 000000000..4eb017186
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/ComplianceResultEnum.java
@@ -0,0 +1,51 @@
+package com.jero.modules.lawsTechnologyEvaluation.enums;
+
+import com.alibaba.druid.util.StringUtils;
+import com.jero.common.constant.enums.CutEnum;
+
+/**
+ * 符合性结果枚举类
+ */
+public enum ComplianceResultEnum {
+    CONFORMITY("符合","Compliance"),
+    INCONFORMITY("不符合","Non-Compliance"),
+    ;
+
+    String name;
+    String value;
+
+    private ComplianceResultEnum(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public static String getTextByValue(String value,String cut) {
+        ComplianceResultEnum[] values = values();
+        for (ComplianceResultEnum complianceResultEnum : values) {
+            if (complianceResultEnum.value.equals(value)) {
+                if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+                    return complianceResultEnum.name;
+                }else {
+                    return complianceResultEnum.value;
+                }
+            }
+        }
+        return null;
+    }
+}

From 22f0ed57c55725f6a113daf196502c6cadb44708 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 13 Jul 2022 16:17:21 +0800
Subject: [PATCH 051/103] update

---
 .../enums/ComplianceResultEnum.java           | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/ComplianceResultEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/ComplianceResultEnum.java
index 4eb017186..04942f12b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/ComplianceResultEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/ComplianceResultEnum.java
@@ -7,15 +7,17 @@ import com.jero.common.constant.enums.CutEnum;
  * 符合性结果枚举类
  */
 public enum ComplianceResultEnum {
-    CONFORMITY("符合","Compliance"),
-    INCONFORMITY("不符合","Non-Compliance"),
+    CONFORMITY("符合","Compliance","Compliance"),
+    INCONFORMITY("不符合","Non-Compliance","Non-Compliance"),
     ;
 
     String name;
+    String enName;
     String value;
 
-    private ComplianceResultEnum(String name, String value) {
+    private ComplianceResultEnum(String name,String enName, String value) {
         this.name = name;
+        this.enName = enName;
         this.value = value;
     }
 
@@ -35,14 +37,22 @@ public enum ComplianceResultEnum {
         this.value = value;
     }
 
-    public static String getTextByValue(String value,String cut) {
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+    public static String getTextByValue(String value, String cut) {
         ComplianceResultEnum[] values = values();
         for (ComplianceResultEnum complianceResultEnum : values) {
             if (complianceResultEnum.value.equals(value)) {
                 if(StringUtils.equals(cut, CutEnum.CN.getValue())){
                     return complianceResultEnum.name;
                 }else {
-                    return complianceResultEnum.value;
+                    return complianceResultEnum.enName;
                 }
             }
         }

From b3dd749d8eee5e0973373debb07b0006f9187fe4 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 13 Jul 2022 16:22:43 +0800
Subject: [PATCH 052/103] =?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

---
 jero-web/src/common/lang/en-us.js             |   4 +
 jero-web/src/common/lang/zh-cn.js             |   4 +
 .../components/TermInformation.vue            | 115 ++++++++++++---
 .../components/initiatingProcess.vue          |  93 +++++++++----
 .../components/standardDecompositionSheet.vue | 131 +++++++++++++-----
 .../processForm/evaluationProcess/index.vue   |  13 +-
 6 files changed, 277 insertions(+), 83 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 7d5120366..d05cdc046 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1127,4 +1127,8 @@ module.exports = {
   fileExport:'File export',
   feedbackTime:'Feedback time',
   regulatoryTechnologyAssessmentProcess:'Regulatory technology assessment process',
+  feedbackEvaluation:'Feedback evaluation',
+  clauseEvaluation:'Clause evaluation',
+  standardDocuments:'Standard documents',
+  pleaseCompleteTheEvaluationMethodorEvaluator:'Please complete the evaluation method or evaluator in the list',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 5e8ef43d5..94de35b3b 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1131,4 +1131,8 @@ module.exports = {
   fileExport:'文件导出',
   feedbackTime:'反馈时间',
   regulatoryTechnologyAssessmentProcess:'法规技术评估流程',
+  feedbackEvaluation:'反馈评估',
+  clauseEvaluation:'条款评估',
+  standardDocuments:'标准文件',
+  pleaseCompleteTheEvaluationMethodorEvaluator:'Please complete the evaluation method or evaluator in the list',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
index b44281a68..89f862ffc 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
@@ -1,11 +1,30 @@
 <template>
   <div class="box" style="margin-bottom: 20px">
+    <div style="margin-bottom: 10px;text-align: right">
+      <div @click="handleModule" class="operator-text">
+        <a-icon type="download"/>
+        {{$t('templateDownload')}}
+      </div>
+      <div class="operator-text">
+        <ImportFile :url="url" :isTrue="true" :accept="'.xls'"
+                    @getList="getPersonnelList"/>
+      </div>
+    </div>
+
     <a-table
       :columns="columns"
       :scroll="{x: '100%'}"
       :data-source="dataList"
       :pagination="false"
       :loading="loading">
+      <div slot="clauseContent" slot-scope="text,result">
+        <a-tooltip placement="topLeft">
+          <template slot="title">
+            <span v-html="text"></span>
+          </template>
+          <div class="clauseContent-text" v-html="text"></div>
+        </a-tooltip>
+      </div>
       <span slot="evaluationMethod" slot-scope="text,result">
          <a-tree-select
            tree-node-filter-prop="title"
@@ -17,12 +36,12 @@
            :tree-data="gatherResultList"
            tree-checkable
            :placeholder="$t('PleaseSelect')+$t('evaluationMethod')"
-        />
+         />
       </span>
-      <span slot="Assessor" slot-scope="text,result">
+      <span slot="Assessor" slot-scope="text,result,index">
           <PersonnelSelection class="box-input"
                               :personneQuery="result"
-                              :query="{db_field_name:'evaluatorIds',db_field_txt:$t('Assessor')}"
+                              :query="{db_field_name:'evaluatorIds',db_field_txt:$t('Assessor'),subscript:index}"
                               :isInput="true"
                               @change="PersonnelSelectionChange"
                               v-model="result.evaluatorIdsName"/>
@@ -36,32 +55,40 @@
 
 <script>
   import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import ImportFile from '@/components/ImportFile/index'
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+
   export default {
     name: 'TermInformation',
-    components:{
-      PersonnelSelection
+    components: {
+      PersonnelSelection,
+      ImportFile
     },
-    props:['gatherResultList'],
+    props: ['gatherResultList'],
     data() {
       return {
+        url: {
+          importZipUrl: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/importItemExcel'
+        },
         columns: [
           {
             title: this.$t('clauseNo'),
-            dataIndex: 'items_num',
+            dataIndex: 'itemNum',
             align: 'center',
             ellipsis: true
           },
           {
             title: this.$t('clauseName'),
-            dataIndex: 'items_name',
+            dataIndex: 'itemName',
             align: 'center',
             ellipsis: true
           },
           {
             title: this.$t('clauseContent'),
-            dataIndex: 'iterms_conditions',
+            dataIndex: 'itemContent',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            scopedSlots: { customRender: 'clauseContent' }
           },
           {
             title: this.$t('evaluationMethod'),
@@ -77,26 +104,69 @@
           },
           {
             title: this.$t('operation'),
-            dataIndex: 'Assessor',
             align: 'center',
             width: 100,
             scopedSlots: { customRender: 'operation' }
           }
         ],
-        dataList: [{}],
+        dataList: [],
         loading: false
       }
     },
     mounted() {
     },
     methods: {
-      deleteData() {
+      deleteData(item) {
+        this.dataList = this.dataList.filter(res => {
+          return res.itemId != item.itemId
+        })
+        this.$emit('TermInformationRefForm', item)
+      },
+      PersonnelSelectionChange(value, id, index) {
+        this.dataList[index][value] = id
+        this.dataList = [...this.dataList]
+      },
+      getData(value) {
+        this.dataList = []
+        if (value && value.length > 0) {
+          value.forEach(res => {
+            this.dataList.push({
+              itemId: res.id,
+              itemNum: res.items_num,
+              itemName: res.items_name,
+              itemContent: res.iterms_conditions
+            })
+          })
+        }
+        this.dataList = [...this.dataList]
+      },
+      getPersonnelList() {
 
       },
-      PersonnelSelectionChange(value, id) {
-        this.formInline[value] = id
-        this.formInline = { ...this.formInline }
+      getUUID() {
+        var str = []
+        var Chars = '0123456789abcdefghijklmnopqrstuvwxyz'
+        for (var i = 0; i < 36; i++) {
+          str[i] = Chars.substr(Math.floor(Math.random() * 16), 1)
+        }
+        str[0] = str[8] = str[13] = str[18] = str[23] = '-'
+        return str.join('')
       },
+      submitData(callback) {
+        let dataList = JSON.parse(JSON.stringify(this.dataList))
+        for (let i = 0; i < dataList.length; i++) {
+          dataList[i].evaluationMethods = dataList[i].evaluationMethods.join(',')
+          dataList[i].lawsTechnologyEvaluationId = this.getUUID
+          if (!dataList[i].evaluationMethods || !dataList[i].evaluatorIds) {
+            this.$message.warning(this.$t('pleaseCompleteTheEvaluationMethodorEvaluator'))
+            return
+          }
+        }
+        callback && callback(dataList)
+      },
+      handleModule() {
+        downloadFile('/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/exportItemTemplate', this.$t('clauseEvaluation') + '.xls', {})
+      }
     }
   }
 </script>
@@ -107,4 +177,17 @@
     width: 70%;
     height: 38px;
   }
+
+  .clauseContent-text {
+    width: 100%;
+    overflow: hidden;
+    display: -webkit-box;
+    text-overflow: ellipsis;
+    /*! autoprefixer: off */
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    /*! autoprefixer: on;*/
+    text-justify: inter-ideograph;
+    word-break: break-all
+  }
 </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 e7cd9c853..8d2c3dff6 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -127,6 +127,7 @@
                     tree-node-filter-prop="title"
                     v-model="formInline.evaluationMethods"
                     :maxTagCount="1"
+                    @change="evaluationMethodsChange"
                     :getPopupContainer="triggerNode=> triggerNode.parentNode"
                     class="box-input"
                     style="width: 100%"
@@ -155,7 +156,13 @@
             </a-col>
           </a-row>
         </a-form-model>
-        <TermInformation :gatherResultList="gatherResultList" v-if="isTrue"/>
+
+        <TermInformation
+          ref="TermInformationRef"
+          @TermInformationRefForm="TermInformationRefForm"
+          :gatherResultList="gatherResultList"
+          v-if="isTrue"/>
+
         <footerProcess
           @submit="submit"
           :isSubmit="true"
@@ -211,6 +218,7 @@
         pageSize: 10,
         pageNo: 1,
         formInline: {},
+        standardDecomposition: [],
         gatherResultList: [],
         rules: {
           endTime: [
@@ -358,16 +366,20 @@
             technologyTerritory: content[0].technology_territory_id
           })
         }
+        this.standardDecomposition = content
       },
       standardDecompositionDocumentClick() {
-        if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length > 0) {
-          this.$refs.standardDecompositionSheetRef.getData(JSON.parse(JSON.stringify(this.selectedRowKeysRecord[0])))
+        if (this.standardDecomposition && this.standardDecomposition.length > 0) {
+          this.$refs.standardDecompositionSheetRef.getData(JSON.parse(JSON.stringify(this.standardDecomposition[0])))
         } else {
           this.$message.warning(this.$t('pleaseSelectStandardFirst'))
         }
       },
       standardDecompositionSheetForm(value) {
-
+        this.$refs.TermInformationRef.getData(JSON.parse(JSON.stringify(value)))
+      },
+      TermInformationRefForm(value) {
+        this.$refs.standardDecompositionSheetRef.getRowList(JSON.parse(JSON.stringify(value)))
       },
       clickButtonToUpload(item) {
         this.$refs.uploadFile.perentHandleFunc()
@@ -397,6 +409,10 @@
         this.formInline[value] = id
         this.formInline = { ...this.formInline }
       },
+      evaluationMethodsChange(key, name) {
+        this.formInline.evaluationMethods = []
+        this.formInline.evaluationMethods = name
+      },
       dateChange(item) {
         this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : ''
       },
@@ -415,37 +431,56 @@
             if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length == 0) {
               this.$message.warning(this.$t('pleaseSelectStandard'))
             } else {
-              this.JLoading = true
-              let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0])
-              if (this.isTrue) {
-                value.evaluationType = 'Item evaluation'
+              if (this.$refs.TermInformationRef) {
+                this.$refs.TermInformationRef.submitData((dataList) => {
+                  this.submitData(startTime, dataList)
+                })
               } else {
-                value.evaluationType = 'Feedback evaluation'
+                this.submitData(startTime)
               }
-              value.startTime = startTime
-              value.flowStatus = 'Underway'
-              value.taskAffirmDueDate = value.endTime
-              value.lawsTechnologyEvaluationId = this.getUUID()
-              value.regulationOwnerId = this.userInfo().id
-              Object.keys(value).forEach(res => {
-                if (value[res] && value[res] instanceof Array) {
-                  value[res] = value[res].join(',')
-                }
-                if (value[res] && value[res] instanceof String) {
-                  value[res] = value[res].replace(/\"/g, '“')
-                  value[res] = value[res].replace(/\'/g, '‘')
-                }
-              })
-              this.startProcess(value)
             }
           }
         })
       },
-      startProcess(value) {
-        let query = {
-          type: 6,
-          ...value,
-          msg: JSON.stringify(value.evaluators).replace(/\"/g, '\'')
+      submitData(startTime, dataList) {
+        this.JLoading = true
+        let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0])
+        if (this.isTrue) {
+          value.evaluationType = 'Item evaluation'
+        } else {
+          value.evaluationType = 'Feedback evaluation'
+        }
+        value.startTime = startTime
+        value.flowStatus = 'Underway'
+        value.taskAffirmDueDate = value.endTime
+        value.lawsTechnologyEvaluationId = this.getUUID()
+        value.regulationOwnerId = this.userInfo().id
+        value.regulationOwnerName = this.userInfo().username
+        Object.keys(value).forEach(res => {
+          if (value[res] && value[res] instanceof Array) {
+            value[res] = value[res].join(',')
+          }
+          if (value[res] && value[res] instanceof String) {
+            value[res] = value[res].replace(/\"/g, '“')
+            value[res] = value[res].replace(/\'/g, '‘')
+          }
+        })
+        this.startProcess(value, dataList)
+      },
+      startProcess(value, dataList) {
+        let query = {}
+        if (this.isTrue) {
+          query = {
+            type: 6,
+            ...value,
+            msg: JSON.stringify({ itemList: dataList }).replace(/\"/g, '\'')
+          }
+        } else {
+          query = {
+            type: 6,
+            ...value,
+            msg: JSON.stringify({ evaluators: this.$refs.TermInformationRef.dataList }).replace(/\"/g, '\'')
+          }
         }
         postAction('/workFlow/startProcess', query).then((res) => {
           if (res.success) {
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue
index 511c36717..d7d0a0c65 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue
@@ -2,7 +2,7 @@
   <a-drawer
     :title="$t('StandardBreakdown')"
     :maskClosable="false"
-    :width="1000"
+    :width="1200"
     placement="right"
     :closable="true"
     @close="handleCancel"
@@ -14,37 +14,55 @@
           <a-row :gutter="24">
             <a-col :md="12" :sm="8">
               <div class="box-title-text">
-                <div class="title-text" :title="$t('standard')">
-                  <span>{{$t('standard')}}</span>
+                <div class="title-text" :title="$t('standardDocuments')">
+                  <span>{{$t('standardDocuments')}}</span>
                 </div>
-                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
-                         v-model="queryParam.serial_number"></a-input>
+                <a-select :placeholder="$t('PleaseSelect')+$t('standardDocuments')"
+                          class="box-input"
+                          @change="standardDocumentsChange"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          v-model="queryParam.info_id">
+                  <a-select-option v-for="(item, key) in sarFileSplitInfoList"
+                                   :key="key"
+                                   :value="item.id">
+                     <span style="display: inline-block;width: 100%" :title=" item.fileName ">
+                           {{ item.fileName }}
+                     </span>
+                  </a-select-option>
+                </a-select>
               </div>
             </a-col>
-            <span style="float: right;overflow: hidden;margin-top: 4px" class="table-page-search-submitButtons">
-               <a-col :md="12" :sm="24">
-                   <div @click="handleModule" class="operator-text">
-                       <a-icon type="download"/>
-                      {{$t('templateDownload')}}
-                    </div>
-                    <div class="operator-text">
-                      <ImportFile :url="url" :projectId="$route.query.id" :isTrue="true" :accept="'.xls'"
-                                  @getList="getPersonnelList"/>
-                     </div>
-                    </a-col>
-            </span>
+            <!--            <span style="float: right;overflow: hidden;margin-top: 4px" class="table-page-search-submitButtons">-->
+            <!--               <a-col :md="12" :sm="24">-->
+            <!--                   <div @click="handleModule" class="operator-text">-->
+            <!--                       <a-icon type="download"/>-->
+            <!--                      {{$t('templateDownload')}}-->
+            <!--                    </div>-->
+            <!--                    <div class="operator-text">-->
+            <!--                      <ImportFile :url="url" :projectId="$route.query.id" :isTrue="true" :accept="'.xls'"-->
+            <!--                                  @getList="getPersonnelList"/>-->
+            <!--                     </div>-->
+            <!--                    </a-col>-->
+            <!--            </span>-->
           </a-row>
         </a-form>
       </div>
       <a-table
         :columns="columns"
         rowKey="id"
-        :scroll="{x: 1200}"
+        :scroll="{x: '100%'}"
         :data-source="dataList"
         :pagination="false"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :loading="loading">
-
+        <div slot="clauseContent" slot-scope="text,result">
+          <a-tooltip placement="topLeft">
+            <template slot="title">
+              <span v-html="text"></span>
+            </template>
+            <div class="clauseContent-text" v-html="text"></div>
+          </a-tooltip>
+        </div>
       </a-table>
       <div class="page" v-if="dataList.length > 0">
         <a-pagination
@@ -82,6 +100,7 @@
         queryParam: {},
         confirmLoading: false,
         selectedRowKeys: [],
+        sarFileSplitInfoList: [],
         url: {
           list: '/split/sarFileSplitItems/getSplitItemsByPage'
         },
@@ -90,30 +109,35 @@
             title: this.$t('clauseNo'),
             dataIndex: 'items_num',
             align: 'center',
+            width: 180,
             ellipsis: true
           },
           {
             title: this.$t('clauseName'),
             dataIndex: 'items_name',
             align: 'center',
+            width: 180,
             ellipsis: true
           },
           {
             title: this.$t('clauseContent'),
             dataIndex: 'iterms_conditions',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            scopedSlots: { customRender: 'clauseContent' }
           },
           {
             title: this.$t('technicalField'),
             dataIndex: 'technology_territory',
             align: 'center',
+            width: 180,
             ellipsis: true
           },
           {
             title: this.$t('informationCategory'),
             dataIndex: 'information_category',
             align: 'center',
+            width: 180,
             ellipsis: true
           }
         ],
@@ -125,18 +149,40 @@
         total: 0,
         standData: {},
         fieldList: [],
-        queryConditionVOList: []
+        queryConditionVOList: [],
+        info_id: '',
+        selectedRowKeysData: []
       }
     },
     methods: {
       handleModule() {
 
       },
-      getData(row) {
-        this.standData = row
-        this.visible = true
+      standardDocumentsChange(value) {
         this.replacePage()
       },
+      getData(row) {
+        this.total = 0
+        this.dataList = []
+        this.standData = row
+        this.sarFileSplitInfoList = this.standData.sarFileSplitInfoList || []
+        this.sarFileSplitInfoList = [...this.sarFileSplitInfoList]
+        this.queryParam.info_id = this.sarFileSplitInfoList && this.sarFileSplitInfoList.length > 0 ? this.sarFileSplitInfoList[0].id : ''
+        this.visible = true
+        if (this.queryParam.info_id) {
+          this.replacePage()
+        }
+      },
+      getRowList(value) {
+        if (value && value.itemId) {
+          this.selectedRowKeys =  this.selectedRowKeys.filter(res=>{
+             return value.itemId != res
+          })
+          this.selectedRowKeysData =  this.selectedRowKeysData.filter(res=>{
+            return value.itemId != res.id
+          })
+        }
+      },
       searchQuery() {
         this.pageNo = 1
         this.replacePage()
@@ -144,6 +190,7 @@
       searchReset() {
         this.pageNo = 1
         this.queryParam = {}
+        this.queryParam.info_id = this.sarFileSplitInfoList && this.sarFileSplitInfoList.length > 0 ? this.sarFileSplitInfoList[0].id : ''
         this.replacePage()
       },
       onChange(page, pageSize) {
@@ -160,12 +207,13 @@
         this.replacePage()
       },
       replacePage() {
+        let pageNo = JSON.parse(JSON.stringify(this.pageNo))
+        let pageSize = JSON.parse(JSON.stringify(this.pageSize))
         let query = {
-          pageNo: this.pageNo,
-          pageSize: this.pageSize,
-          info_id: this.standData.id,
-          menu_id:'',
-          ...this.queryParam
+          pageNo: pageNo + '',
+          pageSize: pageSize + '',
+          info_id: this.queryParam.info_id,
+          menu_id: ''
         }
         this.loading = true
         postAction(this.url.list, query).then((res) => {
@@ -184,10 +232,16 @@
         this.visible = false
       },
       handleSubmit() {
-
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.$emit('standardDecompositionSheetForm', this.selectedRowKeysData)
+          this.visible = false
+        } else {
+          this.$message.warning(this.$t('PleaseSelectData'))
+        }
       },
-      onSelectChange() {
-
+      onSelectChange(value, record) {
+        this.selectedRowKeys = value
+        this.selectedRowKeysData = record
       }
     }
   }
@@ -244,4 +298,17 @@
   .box-button {
     height: 38px;
   }
+
+  .clauseContent-text {
+    width: 100%;
+    overflow: hidden;
+    display: -webkit-box;
+    text-overflow: ellipsis;
+    /*! autoprefixer: off */
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    /*! autoprefixer: on;*/
+    text-justify: inter-ideograph;
+    word-break: break-all
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
index bddbf9efc..3f3f20893 100644
--- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
@@ -71,7 +71,7 @@
         standardContentList: [
           {
             title: this.$t('standard'),
-            value: 'serial_number'
+            value: 'serialNumber'
           },
           {
             title: this.$t('title'),
@@ -91,7 +91,7 @@
           },
           {
             title: this.$t('RelevantMaterials'),
-            value: 'RelevantMaterials',
+            value: 'relatedDataFileId',
             type: 2
           },
           {
@@ -106,10 +106,10 @@
       }
     },
     mounted() {
-      this.isDisplay = true
-      // this.queryTaskDetailByTask(() => {
-      //   this.lawsOpinionAssessmentResult()
-      // })
+      this.isDisplay = false
+      this.queryTaskDetailByTask(() => {
+        this.lawsOpinionAssessmentResult()
+      })
     },
     methods: {
       ...mapGetters(['userInfo']),
@@ -123,6 +123,7 @@
             this.queryProject = res || {}
             callback && callback()
           }
+          this.queryProject.evaluationTypeName = this.queryProject.evaluationType == 'Feedback evaluation' ? this.$t('feedbackEvaluation') :this.$t('clauseEvaluation')
         })
       },
       lawsOpinionAssessmentResult() {

From bea497c3d34059ba1ddb8ed05fc6c36cabd44eb7 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Wed, 13 Jul 2022 16:45:54 +0800
Subject: [PATCH 053/103] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9-=E5=8F=98=E6=9B=B4=EF=BC=9A=E6=B7=BB=E5=8A=A0"?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98"=E6=8E=A7=E4=BB=B6=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOServiceImpl.java   |  5 +++++
 .../impl/ParamsManifestEOServiceImpl.java     | 19 +++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 112e02295..116df66f3 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -911,6 +911,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 	@Override
 	public List<Map<String, String>> getLoginUserTypes(ParamsCollectManifestVO paramsCollectManifestVO, String cut) {
+		if (StringUtils.isEmpty(paramsCollectManifestVO.getProjectId()) || StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId())) {
+			throw new JeroBootException("参数不能为空！");
+		}
+
 		String projectId = paramsCollectManifestVO.getProjectId();
 		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
 
@@ -1055,6 +1059,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 		LambdaQueryWrapper<ParamsCollectManifestEO> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.eq(ParamsCollectManifestEO::getParamsManifestId, paramsManifestId)
+				.notIn(ParamsCollectManifestEO::getControlType, ControlTypeEnum.Title.getValue())
 				.orderByDesc(ParamsCollectManifestEO::getUpdateTime); // 按修改时间降序
 		List<ParamsCollectManifestEO> list = list(queryWrapper);
 		int collectFinishNumber = (int) list.stream().filter(e->CollectManifestStateEnum.SYNC_REPORT.getValue().equals(e.getState())).count();
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
index 49a3b33ab..51fe947a7 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
@@ -23,6 +23,7 @@ import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO;
 import com.jero.modules.cert.report.service.IParamsReportEOService;
 import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
 import com.jero.modules.cert.template.entity.ParamsTemplateEO;
+import com.jero.modules.cert.template.enums.ControlTypeEnum;
 import com.jero.modules.cert.template.service.IParamsInfoPublishEOService;
 import com.jero.modules.cert.template.service.IParamsTemplateEOService;
 import com.jero.modules.project.entity.ProjectRelatedPersonnel;
@@ -126,14 +127,16 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 			target.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); // 设置变更标识
 
 
-			// 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
-			ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(paramsManifestEO.getProjectId(), source.getDutyTerritory());
-			if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) {
-				String sdtId = projectRelatedPersonnel.getEngineeringInterfacePerson();
-				if (StringUtils.isNotBlank(sdtId) && !sdtId.contains(",")) { // 领域中仅有一个人时，添加该字段
-					SysUser sysUser = sysUserService.getById(sdtId);
-					if (ObjectUtil.isNotEmpty(sysUser)) {
-						target.setSdt(sysUser.getUsername());
+			if (!ControlTypeEnum.Title.getValue().equals(source.getControlType())) {
+				// 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
+				ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(paramsManifestEO.getProjectId(), source.getDutyTerritory());
+				if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) {
+					String sdtId = projectRelatedPersonnel.getEngineeringInterfacePerson();
+					if (StringUtils.isNotBlank(sdtId) && !sdtId.contains(",")) { // 领域中仅有一个人时，添加该字段
+						SysUser sysUser = sysUserService.getById(sdtId);
+						if (ObjectUtil.isNotEmpty(sysUser)) {
+							target.setSdt(sysUser.getUsername());
+						}
 					}
 				}
 			}

From 0f9adb33e8db55dbc676f6590cac6d5c1609308b Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Wed, 13 Jul 2022 16:55:22 +0800
Subject: [PATCH 054/103] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=93-"=E6=A0=87=E9=A2=98"=E6=8E=A7=E4=BB=B6=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ParamsReportDetailEOServiceImpl.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
index 629c3eebd..52f87910b 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
@@ -411,6 +411,17 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 			}
 			paramsConfigDataVOList.add(fileConfigDataVO);
 
+		} else if (ControlTypeEnum.Title.getValue().equals(controlType)) {
+
+			ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
+			configDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
+			configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			configDataVO.setIsLock(paramsConfigEO.getIsLock());
+			if (StringUtils.isNotEmpty(paramsCollectManifestEO.getTitleDefaultValue())) {
+				configDataVO.setDataValue(paramsCollectManifestEO.getTitleDefaultValue());
+			}
+			paramsConfigDataVOList.add(configDataVO);
+
 		}
 		return paramsConfigDataVOList;
 	}

From dcd94c375740209ce6d81273da6bec60a754146e Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 13 Jul 2022 16:56:53 +0800
Subject: [PATCH 055/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=A0=B9=E6=8D=AE=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=AE=9E=E4=BE=8Bid=E3=80=81=E6=B3=95=E8=A7=84=E6=8A=80?=
 =?UTF-8?q?=E6=9C=AF=E8=AF=84=E4=BC=B0id=20=E6=9F=A5=E8=AF=A2=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0=E7=BB=93=E6=9E=9C=E4=B8=8E=E7=AC=A6=E5=90=88=E6=80=A7?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...sTechnologyEvaluationResultEOController.java | 15 +++++++++++++++
 ...LawsTechnologyEvaluationResultEOService.java |  8 ++++++++
 ...TechnologyEvaluationResultEOServiceImpl.java | 17 +++++++++++++++++
 3 files changed, 40 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java
index 3b91ded39..61d19b865 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationResultEOController.java
@@ -184,4 +184,19 @@ public class LawsTechnologyEvaluationResultEOController extends JeroController<L
 		 lawsTechnologyEvaluationResultEOService.evaluatorSaveResult(json);
 		 return Result.OK("添加成功！");
 	 }
+
+	 /**
+	  * 根据流程实例id、法规技术评估id 查询评估结果与符合性结果接口
+	  * @param lawsTechnologyEvaluationResultEO
+	  * @param req
+	  * @return
+	  */
+	 @AutoLog(value = "法规技术评估流程-查询评估结果与符合性结果接口")
+	 @ApiOperation(value="法规技术评估流程-查询评估结果与符合性结果接口", notes="法规技术评估流程-查询评估结果与符合性结果接口")
+	 @GetMapping(value = "/queryEvaluationResultAndComplianceResult")
+	 public Result<?> queryEvaluationResultAndComplianceResult(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO,
+																	 HttpServletRequest req) {
+		 JSONObject json = lawsTechnologyEvaluationResultEOService.queryEvaluationResultAndComplianceResult(lawsTechnologyEvaluationResultEO,req);
+		 return Result.OK(json);
+	 }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java
index e7f842c8c..72ccf5561 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java
@@ -68,4 +68,12 @@ public interface ILawsTechnologyEvaluationResultEOService extends IService<LawsT
 	 * @param json
 	 */
     void evaluatorSaveResult(JSONObject json);
+
+	/**
+	 * 根据流程实例id、法规技术评估id 查询评估结果与符合性结果接口
+	 * @param lawsTechnologyEvaluationResultEO
+	 * @param req
+	 * @return
+	 */
+    JSONObject queryEvaluationResultAndComplianceResult(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO, HttpServletRequest req);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java
index 221725daa..da8eebbee 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java
@@ -147,4 +147,21 @@ public class LawsTechnologyEvaluationResultEOServiceImpl extends ServiceImpl<Law
 			this.saveBatch(evaluationResultEOList);
 		}
 	}
+
+	@Override
+	public JSONObject queryEvaluationResultAndComplianceResult(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO, HttpServletRequest req) {
+		JSONObject result = new JSONObject();
+		List<LawsTechnologyEvaluationResultEO> evaluationResultEOList = this.queryList(lawsTechnologyEvaluationResultEO, req);
+		result.put("evaluationResultEOList",evaluationResultEOList);
+
+		QueryWrapper<LawsTechnologyEvaluationComplianceResultEO> complianceResultEOQueryWrapper = new QueryWrapper<>();
+		complianceResultEOQueryWrapper.lambda().eq(LawsTechnologyEvaluationComplianceResultEO::getActiProcInstId,lawsTechnologyEvaluationResultEO.getActiProcInstId());
+		complianceResultEOQueryWrapper.lambda().eq(LawsTechnologyEvaluationComplianceResultEO::getLawsTechnologyEvaluationId,lawsTechnologyEvaluationResultEO.getLawsTechnologyEvaluationId());
+		complianceResultEOQueryWrapper.lambda().eq(LawsTechnologyEvaluationComplianceResultEO::getCreateBy,lawsTechnologyEvaluationResultEO.getCreateBy());
+		List<LawsTechnologyEvaluationComplianceResultEO> complianceResultEOList = complianceResultEOService.list(complianceResultEOQueryWrapper);
+		if(CollectionUtils.isNotEmpty(complianceResultEOList)){
+			result.put("complianceResult",complianceResultEOList.get(0));
+		}
+		return result;
+	}
 }

From 857251e18300f35dc2ca4db4589aa812a7f6ca68 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 13 Jul 2022 17:31:30 +0800
Subject: [PATCH 056/103] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E4=B8=8A=E6=8A=A5=E5=BA=93=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B-=E9=85=8D=E7=BD=AE=E5=88=97=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/CollectionType/index.vue   | 25 +++++++++++++++++++
 .../parameterlist/components/addModel.vue     |  5 ++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index 635d03811..94961b84c 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -96,6 +96,31 @@
           </div>
         </div>
       </div>
+      <!--      默认值-->
+      <div v-if='detailDate.controlType === "11"' class='add_flex'>
+        <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
+          <div v-if='item.type==="text"'>
+            <!--            文本校验  分情况-->
+            <!--            1 无-->
+            <!--            2 中文-->
+            <!--            3 正整数-->
+            <!--            4 政府点数-->
+            <!--            5 证书或小数-->
+            <!--            6 一位小数-->
+            <!--            7 两位小数-->
+            <!--            8 三位小数-->
+            <!--            9 四为小数-->
+            <!--           无 -->
+            <div>
+              <a-input class="box-input inputWid"
+                       :maxLength="1000"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')"
+                       v-model="item.dataValue"/>
+            </div>
+          </div>
+        </div>
+      </div>
       <!--      纯下拉单选-->
       <div v-else-if='detailDate.controlType === "2"' class='add_flex'>
         <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index d04ec6657..705be6cec 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -191,7 +191,7 @@
                 </a-form-model-item>
               </div>
             </a-col>
-            <a-col :span="12" v-if='this.formInline.controlType =="11"'>
+            <a-col :span="12" v-else-if='this.formInline.controlType =="11"'>
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="Required">*</span>
@@ -199,7 +199,8 @@
                         :title="$t('DefaultValue')">{{$t('DefaultValue')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="titleDefaultValue">
-                  <a-input class="box-input add-input"
+                  <a-input class="box-input"
+                           style="height:33px"
                            :disabled="disabled"
                            :maxlength="100"
                            v-model="formInline.titleDefaultValue"

From 4877c3706d27f7180a3a68b04a1bed1690770d81 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 13 Jul 2022 17:33:48 +0800
Subject: [PATCH 057/103] =?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

---
 jero-web/src/common/lang/zh-cn.js             |  2 +-
 .../components/initiatingProcess.vue          |  9 +-
 .../components/evaluatorFeedback.vue          | 91 ++++++++++++++-----
 .../processForm/evaluationProcess/index.vue   | 77 ++++++++--------
 4 files changed, 116 insertions(+), 63 deletions(-)

diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 94de35b3b..4c2a26c01 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1134,5 +1134,5 @@ module.exports = {
   feedbackEvaluation:'反馈评估',
   clauseEvaluation:'条款评估',
   standardDocuments:'标准文件',
-  pleaseCompleteTheEvaluationMethodorEvaluator:'Please complete the evaluation method or evaluator in the list',
+  pleaseCompleteTheEvaluationMethodorEvaluator:'请补全列表中评估方式或评估人',
 }
\ 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 8d2c3dff6..662cbdcf2 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -410,8 +410,9 @@
         this.formInline = { ...this.formInline }
       },
       evaluationMethodsChange(key, name) {
-        this.formInline.evaluationMethods = []
-        this.formInline.evaluationMethods = name
+        this.formInline.evaluationMethods = key
+        this.formInline.evaluationMethodsName = []
+        this.formInline.evaluationMethodsName = name
       },
       dateChange(item) {
         this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : ''
@@ -431,7 +432,7 @@
             if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length == 0) {
               this.$message.warning(this.$t('pleaseSelectStandard'))
             } else {
-              if (this.$refs.TermInformationRef) {
+              if (this.isTrue) {
                 this.$refs.TermInformationRef.submitData((dataList) => {
                   this.submitData(startTime, dataList)
                 })
@@ -479,7 +480,7 @@
           query = {
             type: 6,
             ...value,
-            msg: JSON.stringify({ evaluators: this.$refs.TermInformationRef.dataList }).replace(/\"/g, '\'')
+            msg: JSON.stringify({ evaluators: value.evaluators }).replace(/\"/g, '\'')
           }
         }
         postAction('/workFlow/startProcess', query).then((res) => {
diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
index a9b0fcefe..f69d75e3a 100644
--- a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
+++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
@@ -11,15 +11,19 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="Required">*</span>
+                <span class="Required" v-if="!disabled">*</span>
                 <span class="title-text-text" :title="$t('complianceResults')">{{$t('complianceResults')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="flag">
-                <a-radio-group style="margin-top: 2px" class="box-input" v-model="formInline.flag">
-                  <a-radio value="0">
+              <div class="title-text-right" v-if="disabled">
+                {{formInline.complianceResult == 'Compliance'?$t('accord'):$t('nonConformity')}}
+              </div>
+              <a-form-model-item class="itemModel" v-if="!disabled" :prop="!disabled?'complianceResult':''">
+                <a-radio-group style="margin-top: 2px" class="box-input"
+                               v-model="formInline.complianceResult">
+                  <a-radio value="Compliance">
                     {{$t('accord')}}
                   </a-radio>
-                  <a-radio value="1">
+                  <a-radio value="Non-Compliance">
                     {{$t('nonConformity')}}
                   </a-radio>
                 </a-radio-group>
@@ -32,21 +36,24 @@
             {{$t('feedbackPoint')+(index+1)}}
             <a-icon class="icon-size"
                     @click="addData"
-                    v-if="(formInline.dataList.length-1) == index"
+                    v-if="(formInline.dataList.length-1) == index && !disabled"
                     type="plus-circle"/>
             <a-icon class="icon-size"
                     @click="deleteData"
-                    v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index"
+                    v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index && !disabled"
                     type="minus-circle"/>
           </div>
           <a-row :gutter="24">
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
                 </div>
-                <a-form-model-item class="itemModel"
+                <div class="title-text-right" v-if="disabled">
+                  {{item.relatedSection}}
+                </div>
+                <a-form-model-item class="itemModel" v-if="!disabled"
                                    :prop="'dataList.'+index+'.relatedSection'"
                                    :rules="[{ required: true, message: $t('relevantSections') + $t('cannotEmpty'), trigger: 'blur'},
                                    {max: 300,message: $t('relevantSections') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
@@ -61,11 +68,14 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text"
                         :title="$t('problemDescription')">{{$t('problemDescription')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" :prop="'dataList.'+index+'.issueOrSuggest'"
+                <div class="title-text-right" v-if="disabled">
+                  {{item.issueOrSuggest}}
+                </div>
+                <a-form-model-item class="itemModel" :prop="'dataList.'+index+'.issueOrSuggest'" v-if="!disabled"
                                    :rules="[{ required: true, message: $t('problemDescription') + $t('cannotEmpty'), trigger: 'blur'},
                                    {max: 300,message: $t('problemDescription') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
                                     }]">
@@ -83,7 +93,15 @@
                 <div class="title-text">
                   <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="accessoryFile">
+                <div class="title-text-right" v-if="disabled">
+                  <span style="color: #21c9cc" v-if="item.accessoryFile" @click="viewUploadedFilesClick(item.accessoryFile)">
+                     {{$t('viewUploadedFiles')}}
+                  </span>
+                  <span v-else>
+                     --
+                  </span>
+                </div>
+                <a-form-model-item class="itemModel" prop="accessoryFile" v-if="!disabled">
                   <a-button type="primary" class="button-text"
                             @click="clickButtonToUpload('accessoryFile',index)">
                     {{ (item.accessoryFile === 'null' || item.accessoryFile === '' ||
@@ -98,17 +116,19 @@
       </a-form-model>
     </div>
     <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
+    <viewFileModel ref="viewFileModelRef"/>
   </div>
 </template>
 
 <script>
   import { getAction, postAction } from '@/api/manage'
   import uploadFile from '@/components/uploadFile/file'
-
+  import viewFileModel from '@/components/viewFileModel/index'
   export default {
     name: 'evaluatorFeedback',
     components: {
-      uploadFile
+      uploadFile,
+      viewFileModel
     },
     props: {
       title: {
@@ -120,19 +140,22 @@
         default: (() => {
           return []
         })
+      },
+      complianceResult: {
+        type: Object,
+        default: {}
       }
     },
     data() {
       return {
         formInline: {},
-        disabled: false,
         rules: {
-          flag:[
+          complianceResult: [
             {
               required: true,
               message: this.$t('complianceResults') + this.$t('cannotEmpty'),
               trigger: 'change'
-            },
+            }
           ],
           relatedSection: [
             {
@@ -159,6 +182,7 @@
             }
           ]
         },
+        disabled: false,
         uploadIndex: '',
         dataList: []
       }
@@ -177,8 +201,16 @@
             }
           ]
         }
+        if (this.complianceResult.complianceResult) {
+          this.formInline.complianceResult = this.complianceResult.complianceResult
+        }
         this.formInline = { ...this.formInline }
       })
+      if (this.$route.query.taskDefinitionKey == 'pgrqr') {
+        this.disabled = false
+      } else {
+        this.disabled = true
+      }
     },
     methods: {
       clickButtonToUpload(item, index) {
@@ -204,7 +236,10 @@
         }
         /** 赋值给当前对应的表单文件 */
         this.formInline.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
-        this.formInline = [...this.formInline]
+        this.formInline = { ...this.formInline }
+      },
+      viewUploadedFilesClick(item) {
+        this.$refs.viewFileModelRef.clickButtonToUpload(item)
       },
       addData() {
         this.formInline.dataList.push({
@@ -213,19 +248,22 @@
           reason: '',
           accessoryFile: ''
         })
-        this.formInline = [...this.formInline]
+        this.formInline = { ...this.formInline }
       },
       deleteData() {
         this.formInline.dataList.pop()
-        this.formInline = [...this.formInline]
+        this.formInline = { ...this.formInline }
       },
-      submitData(callBack){
+      submitData(callBack) {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
             callBack && callBack(this.formInline)
           }
         })
       },
+      preservationData(callBack) {
+        callBack && callBack(this.formInline)
+      }
     }
   }
 </script>
@@ -283,6 +321,17 @@
     margin-bottom: 12px;
   }
 
+  .title-text-right {
+    display: inline-block;
+    width: calc(100% - 130px);
+    padding-top: 15px;
+    font-size: 14px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    color: #000F16;
+  }
+
   .Required {
     color: red;
     margin-right: 4px;
diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
index 3f3f20893..69ff81f3d 100644
--- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
@@ -13,13 +13,14 @@
           :standardContentQuery="queryProject"
         />
         <evaluatorFeedback
-          v-if="isDisplay"
+          v-if="isDisplay && !isTrue"
           ref="evaluatorFeedbackRef"
+          :complianceResult="complianceResult"
           :feedbackDataList="feedbackDataList"
           :title="$t('evaluatorFeedback')"
         />
         <evaluatorFeedbackList
-          v-if="isDisplay"
+          v-if="isDisplay && isTrue"
           ref="evaluatorFeedbackListRef"
           :title="$t('evaluatorFeedback')"
         />
@@ -47,6 +48,7 @@
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
   import moment from 'moment'
   import { mapGetters } from 'vuex'
+
   export default {
     name: 'evaluationProcess',
     components: {
@@ -62,12 +64,14 @@
         title: this.$t('collectionOfRegulatoryOpinions'),
         url: {
           queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds',
-          list: '/lawsOpinionGather/lawsOpinionAssessmentResultEO/list'
+          list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationResultEO/queryEvaluationResultAndComplianceResult'
         },
         loading: false,
         isDisplay: true,
         feedbackDataList: [],
         queryProject: {},
+        complianceResult:{},
+        isTrue: false,
         standardContentList: [
           {
             title: this.$t('standard'),
@@ -79,7 +83,7 @@
           },
           {
             title: this.$t('regulatoryEngineer'),
-            value: 'currentUserName'
+            value: 'regulationOwnerName'
           },
           {
             title: this.$t('closingDate'),
@@ -87,7 +91,7 @@
           },
           {
             title: this.$t('evaluationMethod'),
-            value: 'evaluationMethod',
+            value: 'evaluationMethodsName'
           },
           {
             title: this.$t('RelevantMaterials'),
@@ -98,44 +102,46 @@
             title: this.$t('processBackground'),
             value: 'processBackground'
           }
-          // {
-          //   title: this.$t('remarks'),
-          //   value: 'remark'
-          // }
         ]
       }
     },
     mounted() {
       this.isDisplay = false
-      this.queryTaskDetailByTask(() => {
-        this.lawsOpinionAssessmentResult()
-      })
+      this.queryTaskDetailByTask()
     },
     methods: {
       ...mapGetters(['userInfo']),
-      queryTaskDetailByTask(callback) {
+      queryTaskDetailByTask() {
         this.loading = true
         getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => {
           if (res instanceof String) {
             this.queryProject = JSON.parse(res) || {}
-            callback && callback()
           } else {
             this.queryProject = res || {}
-            callback && callback()
           }
-          this.queryProject.evaluationTypeName = this.queryProject.evaluationType == 'Feedback evaluation' ? this.$t('feedbackEvaluation') :this.$t('clauseEvaluation')
+          this.isTrue = this.queryProject.evaluationType == 'Feedback evaluation' ? false : true
+          if (this.isTrue) {
+            this.standardContentList = this.standardContentList.filter(res => {
+              return res.title != this.$t('evaluationMethod')
+            })
+          } else {
+            this.lawsOpinionAssessmentResult()
+          }
         })
       },
       lawsOpinionAssessmentResult() {
         getAction(this.url.list, {
-          lawsOpinionGatherId: this.queryProject.id,
-          actiProcInstId: this.$route.query.prcId
+          lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId,
+          actiProcInstId: this.$route.query.prcId,
+          createBy: this.userInfo().username
         }).then((res) => {
           if (res.success) {
-            this.feedbackDataList = res.result || []
+            this.complianceResult = res.result.complianceResult || {}
+            this.feedbackDataList = res.result.evaluationResultEOList || []
             this.loading = false
           } else {
             this.feedbackDataList = []
+            this.complianceResult = {}
             this.loading = false
           }
           this.isDisplay = true
@@ -143,21 +149,21 @@
       },
       preservation() {
         this.loading = true
-        let dataList = this.$refs.feedbackInformationRef.dataList
-        this.insertBatch(dataList, 1)
-      },
-      insertBatch(list, num) {
-        list.forEach(res => {
-          res.lawsOpinionGatherId = this.queryProject.id
-          res.actiProcInstId = this.$route.query.prcId
+        this.$refs.evaluatorFeedbackRef.preservationData((res) => {
+          this.insertBatch(res, 1)
         })
-        postAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/insertBatch', { dataList:list }).then((res) => {
+      },
+      insertBatch(val, num) {
+        let query = {
+          actiProcInstId: this.$route.query.prcId,
+          lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId,
+          complianceResult: val.complianceResult,
+          evaluationResultList: val.dataList
+        }
+        postAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationResultEO/evaluatorSaveResult', query).then((res) => {
           if (res.success) {
             if (num == 1) {
               this.$message.success(this.$t('OperationSuccessful'))
-              this.$router.push({
-                path: '/collectionOfRegulatoryOpinions'
-              })
               this.loading = false
             } else {
               this.completeTask()
@@ -171,9 +177,9 @@
         })
       },
       submit() {
-        this.$refs.evaluatorFeedbackRef.submitData()
-        // let dataList = this.$refs.feedbackInformationRef.dataList
-        // this.insertBatch(dataList, 2)
+        this.$refs.evaluatorFeedbackRef.submitData((res) => {
+          this.insertBatch(res, 2)
+        })
       },
       completeTask() {
         let query = {
@@ -183,13 +189,10 @@
         }
         postAction('/workFlow/completeTask', query).then((res) => {
           if (res.success) {
-            // setTimeout(() => {
-            //   window.close()
-            // }, 1000)
             this.$message.success(this.$t('OperationSuccessful'))
             this.loading = false
             this.$router.push({
-              path: '/collectionOfRegulatoryOpinions'
+              path: '/technologyAssessment'
             })
           } else {
             this.loading = false

From 66f618dd5135001f150f99802b7ca6e0ff699bf4 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Wed, 13 Jul 2022 17:45:40 +0800
Subject: [PATCH 058/103] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=93-=E5=B8=B8=E8=A7=84=E5=AF=BC=E5=87=BA"=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98"=E6=8E=A7=E4=BB=B6=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOServiceImpl.java   |   5 +-
 .../mapper/xml/ParamsReportDetailEOMapper.xml |   1 +
 .../impl/ParamsReportDetailEOServiceImpl.java | 108 ++++++++++--------
 3 files changed, 64 insertions(+), 50 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 116df66f3..10ea4fc41 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -1550,6 +1550,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			}
 		}
 
+		List<String> nioNumberList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList());
 		// 单独添加 控件类型为标题的参数项
 		if (!isSync) { // 未上报
 			List<ParamsCollectManifestEO> paramsCollectManifestEOListOfTitle = paramsCollectManifestEOMapper.listInfoOfTitle(paramsManifestId);
@@ -1564,10 +1565,12 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 					addReportDetailEOList.add(addReportDetailEO);
 				}
 			}
+
+			List<String> nioNumberListOfTitle = paramsCollectManifestEOListOfTitle.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList());
+			nioNumberList.addAll(nioNumberListOfTitle);
 		}
 
 		// 复制认证类别参数
-		List<String> nioNumberList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList());
 		List<CertCategoryParamsInfoPublishEO> certCategoryParamsInfoPublishEOS = certCategoryParamsInfoPublishEOService.queryListByVersionAndNio(paramsManifestEO.getParamsTemplateId(), paramsManifestEO.getParamsTemplatePublishVersion(), nioNumberList);
 		for (CertCategoryParamsInfoPublishEO ccpi : certCategoryParamsInfoPublishEOS) {
 			ReportCertCategoryParamsInfoEO addCcpi = new ReportCertCategoryParamsInfoEO();
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
index e73cb2970..06d76a401 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
@@ -105,6 +105,7 @@
         prd.nio_number as nio_number,
         prd.params_name as params_name,
         prd.control_type as control_type,
+        prd.title_default_value as title_default_value,
         rccpi.params_number as cert_number,
         rccpi.params_name as cert_params_name
         from params_report_detail prd
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
index 52f87910b..1881e36a6 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
@@ -835,6 +835,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 		for (Map<String, Object> record1 : dataList) {
 
 			String paramsCollectManifestId = (String) record1.get("id");
+			String controlType = (String) record1.get("control_type");
+			String titleDefaultValue = (String) record1.get("title_default_value");
 
 			if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
 				List<OSSFile> fileList = new ArrayList<>();
@@ -843,70 +845,78 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 					paramsConfigEOList = paramsConfigEOList.stream().filter(e->configIdList.contains(e.getId())).collect(Collectors.toList()); // 过滤出要导出的配置列
 					paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
 
-						String paramsConfigId = paramsConfigEO.getId();
-						ParamsReportConfigDataEO paramsConfigDataEO = paramsReportConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
-						StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据
-						if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
-							configDataBuilder.append(paramsConfigDataEO.getTextData()).append("&");
-						}
-						if (StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
-							configDataBuilder.append(paramsConfigDataEO.getPullData()).append("&");
-						}
-						if (StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
-							List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId());
-							if (CollectionUtil.isNotEmpty(ossFileList)) {
-								configDataBuilder.append(ossFileList.get(0).getFileName()).append("&");
-
-								fileList.addAll(ossFileList);
+						if (ControlTypeEnum.Title.getValue().equals(controlType)) {
+							record1.put(paramsConfigEO.getId(), titleDefaultValue);
+						} else {
+							String paramsConfigId = paramsConfigEO.getId();
+							ParamsReportConfigDataEO paramsConfigDataEO = paramsReportConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
+							StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据
+							if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
+								configDataBuilder.append(paramsConfigDataEO.getTextData()).append("&");
 							}
-						}
+							if (StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
+								configDataBuilder.append(paramsConfigDataEO.getPullData()).append("&");
+							}
+							if (StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
+								List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId());
+								if (CollectionUtil.isNotEmpty(ossFileList)) {
+									configDataBuilder.append(ossFileList.get(0).getFileName()).append("&");
 
-						String configData = configDataBuilder.toString();
-						if (configData.contains("&")) {
-							configData = configData.substring(0, configData.lastIndexOf("&"));
-						}
+									fileList.addAll(ossFileList);
+								}
+							}
 
-						record1.put(paramsConfigEO.getId(), configData);
+							String configData = configDataBuilder.toString();
+							if (configData.contains("&")) {
+								configData = configData.substring(0, configData.lastIndexOf("&"));
+							}
+
+							record1.put(paramsConfigEO.getId(), configData);
+						}
 					});
 
 				} else if ("2".equals(paramsReportDetailVO.getCombineFlag())) { // 合并
 					String configData = "";
-					List<ParamsReportConfigDataEO> paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId);
+					if (ControlTypeEnum.Title.getValue().equals(controlType)) {
+						record1.put("params_value", titleDefaultValue);
+					} else {
+						List<ParamsReportConfigDataEO> paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId);
 
-					String textDatas = paramsReportConfigDataEOS.stream().filter(e->StringUtils.isNotEmpty(e.getTextData()))
-									.map(ParamsReportConfigDataEO::getTextData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator()));
+						String textDatas = paramsReportConfigDataEOS.stream().filter(e -> StringUtils.isNotEmpty(e.getTextData()))
+								.map(ParamsReportConfigDataEO::getTextData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator()));
 
-					String pullDatas = paramsReportConfigDataEOS.stream().filter(e->StringUtils.isNotEmpty(e.getPullData()))
-									.map(ParamsReportConfigDataEO::getPullData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator()));
+						String pullDatas = paramsReportConfigDataEOS.stream().filter(e -> StringUtils.isNotEmpty(e.getPullData()))
+								.map(ParamsReportConfigDataEO::getPullData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator()));
 
-					List<String> fileNameList = new ArrayList<>();
-					paramsReportConfigDataEOS.forEach(paramsReportConfigDataEO -> {
-						if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getFileConnectId())) {
-							List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(paramsReportConfigDataEO.getFileConnectId());
-							if (CollectionUtil.isNotEmpty(ossFileList)) {
-								fileNameList.add(ossFileList.get(0).getFileName());
+						List<String> fileNameList = new ArrayList<>();
+						paramsReportConfigDataEOS.forEach(paramsReportConfigDataEO -> {
+							if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getFileConnectId())) {
+								List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(paramsReportConfigDataEO.getFileConnectId());
+								if (CollectionUtil.isNotEmpty(ossFileList)) {
+									fileNameList.add(ossFileList.get(0).getFileName());
 
-								fileList.addAll(ossFileList);
+									fileList.addAll(ossFileList);
+								}
 							}
+						});
+
+						StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据
+						if (StringUtils.isNotEmpty(textDatas)) {
+							configDataBuilder.append(textDatas).append("&");
 						}
-					});
+						if (StringUtils.isNotEmpty(pullDatas)) {
+							configDataBuilder.append(pullDatas).append("&");
+						}
+						if (CollectionUtil.isNotEmpty(fileNameList)) {
+							configDataBuilder.append(StringUtils.join(fileNameList, paramsReportDetailVO.getSeparator())).append("&");
+						}
+						configData = configDataBuilder.toString();
+						if (configData.contains("&")) {
+							configData = configData.substring(0, configData.lastIndexOf("&"));
+						}
+						record1.put("params_value", configData);
 
-					StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据
-					if (StringUtils.isNotEmpty(textDatas)) {
-						configDataBuilder.append(textDatas).append("&");
 					}
-					if (StringUtils.isNotEmpty(pullDatas)) {
-						configDataBuilder.append(pullDatas).append("&");
-					}
-					if (CollectionUtil.isNotEmpty(fileNameList)) {
-						configDataBuilder.append(StringUtils.join(fileNameList, ",")).append("&");
-					}
-					configData = configDataBuilder.toString();
-					if (configData.contains("&")) {
-						configData = configData.substring(0, configData.lastIndexOf("&"));
-					}
-					record1.put("params_value", configData);
-
 				}
 				record1.put("fileList", fileList);
 			}

From 5d519167c1910dbf353c3432a82530149f5e1bb6 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 13 Jul 2022 18:16:56 +0800
Subject: [PATCH 059/103] =?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

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../components/evaluatorFeedback.vue          | 49 ++++++++++++++++---
 .../regulatoryCirculationHistory.vue          |  2 +-
 .../processForm/evaluationProcess/index.vue   | 46 +++++++++++++++--
 5 files changed, 85 insertions(+), 14 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index d05cdc046..1dc0d3d5c 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1131,4 +1131,5 @@ module.exports = {
   clauseEvaluation:'Clause evaluation',
   standardDocuments:'Standard documents',
   pleaseCompleteTheEvaluationMethodorEvaluator:'Please complete the evaluation method or evaluator in the list',
+  reviewComments:'Review comments',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 4c2a26c01..4c6a71b22 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1135,4 +1135,5 @@ module.exports = {
   clauseEvaluation:'条款评估',
   standardDocuments:'标准文件',
   pleaseCompleteTheEvaluationMethodorEvaluator:'请补全列表中评估方式或评估人',
+  reviewComments:'审核意见',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
index f69d75e3a..659f96077 100644
--- a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
+++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
@@ -50,7 +50,7 @@
                   <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
                 </div>
-                <div class="title-text-right" v-if="disabled">
+                <div class="title-text-right" :title="item.relatedSection" v-if="disabled">
                   {{item.relatedSection}}
                 </div>
                 <a-form-model-item class="itemModel" v-if="!disabled"
@@ -72,7 +72,7 @@
                   <span class="title-text-text"
                         :title="$t('problemDescription')">{{$t('problemDescription')}}</span>
                 </div>
-                <div class="title-text-right" v-if="disabled">
+                <div class="title-text-right" :title="item.issueOrSuggest" v-if="disabled">
                   {{item.issueOrSuggest}}
                 </div>
                 <a-form-model-item class="itemModel" :prop="'dataList.'+index+'.issueOrSuggest'" v-if="!disabled"
@@ -94,8 +94,9 @@
                   <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
                 </div>
                 <div class="title-text-right" v-if="disabled">
-                  <span style="color: #21c9cc" v-if="item.accessoryFile" @click="viewUploadedFilesClick(item.accessoryFile)">
-                     {{$t('viewUploadedFiles')}}
+                  <span style="color: #21c9cc;cursor: pointer"
+                        v-if="item.accessoryFile" @click="viewUploadedFilesClick(item.accessoryFile)">
+                     {{$t('viewFile')}}
                   </span>
                   <span v-else>
                      --
@@ -113,6 +114,25 @@
             </a-col>
           </a-row>
         </div>
+        <div class="box-text" style="margin-top: 10px" v-if="disabled">
+          <div class="header-text">
+            {{$t('sponsorReview')}}
+          </div>
+        </div>
+        <a-row :gutter="24" v-if="disabled">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('reviewComments')">{{$t('reviewComments')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="approvalOpinion">
+                <a-textarea :placeholder="$t('pleaseEnter')+$t('reviewComments')" v-model="formInline.approvalOpinion"
+                            :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
       </a-form-model>
     </div>
     <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
@@ -124,6 +144,7 @@
   import { getAction, postAction } from '@/api/manage'
   import uploadFile from '@/components/uploadFile/file'
   import viewFileModel from '@/components/viewFileModel/index'
+
   export default {
     name: 'evaluatorFeedback',
     components: {
@@ -157,6 +178,18 @@
               trigger: 'change'
             }
           ],
+          approvalOpinion: [
+            {
+              required: true,
+              message: this.$t('reviewComments') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
+            {
+              max: 300,
+              message: this.$t('reviewComments') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
           relatedSection: [
             {
               required: true,
@@ -315,7 +348,7 @@
   }
 
   .itemModel {
-    width: calc(100% - 130px);
+    width: calc(100% - 110px);
     display: inline-block;
     margin-top: 2px;
     margin-bottom: 12px;
@@ -324,8 +357,8 @@
   .title-text-right {
     display: inline-block;
     width: calc(100% - 130px);
-    padding-top: 15px;
-    font-size: 14px;
+    padding-top: 12px;
+    font-size: 16px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
@@ -351,7 +384,7 @@
   }
 
   .feedbackPoint {
-    font-size: 14px;
+    font-size: 16px;
     font-weight: 400;
     color: #000F16;
     margin-bottom: 10px;
diff --git a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
index 542632113..6fda1fd06 100644
--- a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
+++ b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
@@ -68,7 +68,7 @@
       getList() {
         let query = {
           actiProcInstId: this.$route.query.prcId,
-          flowType: '5'
+          flowType: this.$route.query.prcType
         }
         getAction('/lawsOpinionGather/lawsProcessHistoryEO/list', query).then((res) => {
           if (res.success) {
diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
index 69ff81f3d..17fcc8177 100644
--- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
@@ -26,10 +26,12 @@
         />
         <footerProcess
           v-if="isDisplay"
-          isPreservation
+          :isPreservation="isPreservation"
           :isSubmit="true"
+          :isSendBack="isSendBack"
           @preservation="preservation"
           @submit="submit"
+          @sendBack="sendBack"
         />
         <circulationHistory v-if="isDisplay"/>
       </div>
@@ -70,7 +72,9 @@
         isDisplay: true,
         feedbackDataList: [],
         queryProject: {},
-        complianceResult:{},
+        complianceResult: {},
+        isPreservation: false,
+        isSendBack: false,
         isTrue: false,
         standardContentList: [
           {
@@ -107,6 +111,13 @@
     },
     mounted() {
       this.isDisplay = false
+      if (this.$route.query.taskDefinitionKey == 'pgrqr') {
+        this.isPreservation = true
+        this.isSendBack = false
+      } else {
+        this.isPreservation = false
+        this.isSendBack = true
+      }
       this.queryTaskDetailByTask()
     },
     methods: {
@@ -176,15 +187,40 @@
           }
         })
       },
+      sendBack() {
+        if (this.isTrue) {
+
+        } else {
+          this.$refs.evaluatorFeedbackRef.preservationData((res) => {
+            this.loading = true
+            this.queryProject.approvalOpinion = res.approvalOpinion
+            this.queryProject.flag = '2'
+            this.completeTask()
+          })
+        }
+      },
       submit() {
-        this.$refs.evaluatorFeedbackRef.submitData((res) => {
-          this.insertBatch(res, 2)
-        })
+        if (this.isTrue) {
+
+        } else {
+          this.$refs.evaluatorFeedbackRef.submitData((res) => {
+            if (this.$route.query.taskDefinitionKey == 'pgrqr') {
+              this.loading = true
+              this.insertBatch(res, 2)
+            } else {
+              this.loading = true
+              this.queryProject.approvalOpinion = res.approvalOpinion
+              this.queryProject.flag = '1'
+              this.completeTask()
+            }
+          })
+        }
       },
       completeTask() {
         let query = {
           userid: this.userInfo().id,
           taskId: this.$route.query.taskIds,
+          flag: this.queryProject.flag,
           json: JSON.stringify(this.queryProject).replace(/\"/g, '\'')
         }
         postAction('/workFlow/completeTask', query).then((res) => {

From 6286549c8cdf297716920adeb7578fc5a11767d8 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 13 Jul 2022 18:36:45 +0800
Subject: [PATCH 060/103] =?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            |  2 +-
 .../components/evaluatorFeedbackList.vue      | 59 ++++++++++++++-----
 .../processForm/evaluationProcess/index.vue   | 57 ++++++++++++++++--
 3 files changed, 98 insertions(+), 20 deletions(-)

diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
index 89f862ffc..620a72018 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
@@ -92,7 +92,7 @@
           },
           {
             title: this.$t('evaluationMethod'),
-            dataIndex: 'evaluationMethod',
+            dataIndex: 'evaluationMethods',
             align: 'center',
             scopedSlots: { customRender: 'evaluationMethod' }
           },
diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
index 1711ad4fe..bd94d2b08 100644
--- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
+++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
@@ -14,6 +14,14 @@
         :data-source="dataSource"
         :columns="columns"
       >
+        <div slot="clauseContent" slot-scope="text,result">
+          <a-tooltip placement="topLeft">
+            <template slot="title">
+              <span v-html="text"></span>
+            </template>
+            <div class="clauseContent-text" v-html="text"></div>
+          </a-tooltip>
+        </div>
       </a-table>
     </div>
     <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
@@ -23,8 +31,10 @@
 <script>
   import { getAction, postAction } from '@/api/manage'
   import uploadFile from '@/components/uploadFile/file'
+
   export default {
     name: 'evaluatorFeedback',
+
     components: {
       uploadFile
     },
@@ -33,31 +43,38 @@
         type: String,
         default: ''
       },
+      evaluatorFeedbackList: {
+        type: Array,
+        default: (() => {
+          return []
+        })
+      }
     },
     data() {
       return {
-        disabled:false,
-        loading:false,
-        uploadIndex:'',
-        dataSource:[],
-        columns:[
+        disabled: false,
+        loading: false,
+        uploadIndex: '',
+        dataSource: [],
+        columns: [
           {
             title: this.$t('clauseNo'),
-            dataIndex: 'items_num',
+            dataIndex: 'itemNum',
             align: 'center',
             ellipsis: true
           },
           {
             title: this.$t('clauseName'),
-            dataIndex: 'items_name',
+            dataIndex: 'itemName',
             align: 'center',
             ellipsis: true
           },
           {
             title: this.$t('clauseContent'),
-            dataIndex: 'iterms_conditions',
+            dataIndex: 'itemContent',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            scopedSlots: { customRender: 'clauseContent' }
           },
           {
             title: this.$t('evaluationMethod'),
@@ -94,15 +111,17 @@
             dataIndex: 'complianceResults',
             align: 'center',
             ellipsis: true
-          },
-        ],
+          }
+        ]
       }
     },
     mounted() {
-
+      if (this.evaluatorFeedbackList && this.evaluatorFeedbackList.length > 0) {
+        this.dataSource = this.evaluatorFeedbackList
+      }
     },
     methods: {
-      clickButtonToUpload(item,index) {
+      clickButtonToUpload(item, index) {
         this.$refs.uploadFile.perentHandleFunc()
         this.$refs.uploadFile.visible = true
         this.uploadName = item
@@ -126,7 +145,7 @@
         /** 赋值给当前对应的表单文件 */
         this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
         this.dataList = [...this.dataList]
-      },
+      }
     }
   }
 </script>
@@ -214,4 +233,16 @@
     margin-left: 8px;
     cursor: pointer;
   }
+  .clauseContent-text {
+    width: 100%;
+    overflow: hidden;
+    display: -webkit-box;
+    text-overflow: ellipsis;
+    /*! autoprefixer: off */
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    /*! autoprefixer: on;*/
+    text-justify: inter-ideograph;
+    word-break: break-all
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
index 17fcc8177..c7e7b5d10 100644
--- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
@@ -21,6 +21,7 @@
         />
         <evaluatorFeedbackList
           v-if="isDisplay && isTrue"
+          :evaluatorFeedbackList="evaluatorFeedbackList"
           ref="evaluatorFeedbackListRef"
           :title="$t('evaluatorFeedback')"
         />
@@ -72,11 +73,13 @@
         isDisplay: true,
         feedbackDataList: [],
         queryProject: {},
+        evaluatorFeedbackList: [],
         complianceResult: {},
         isPreservation: false,
         isSendBack: false,
         isTrue: false,
-        standardContentList: [
+        standardContentList:[],
+        standardContent: [
           {
             title: this.$t('standard'),
             value: 'serialNumber'
@@ -106,7 +109,35 @@
             title: this.$t('processBackground'),
             value: 'processBackground'
           }
-        ]
+        ],
+        evaluatorFeedback:[
+          {
+            title: this.$t('standard'),
+            value: 'serialNumber'
+          },
+          {
+            title: this.$t('title'),
+            value: 'title'
+          },
+          {
+            title: this.$t('regulatoryEngineer'),
+            value: 'regulationOwnerName'
+          },
+          {
+            title: this.$t('closingDate'),
+            value: 'endTime'
+          },
+          {
+            title: this.$t('RelevantMaterials'),
+            value: 'relatedDataFileId',
+            type: 2
+          },
+          {},
+          {
+            title: this.$t('processBackground'),
+            value: 'processBackground'
+          }
+        ],
       }
     },
     mounted() {
@@ -132,14 +163,30 @@
           }
           this.isTrue = this.queryProject.evaluationType == 'Feedback evaluation' ? false : true
           if (this.isTrue) {
-            this.standardContentList = this.standardContentList.filter(res => {
-              return res.title != this.$t('evaluationMethod')
-            })
+            this.standardContentList = this.evaluatorFeedback
+            this.lawsTechnologyEvaluationItem()
           } else {
+            this.standardContentList = this.standardContent
             this.lawsOpinionAssessmentResult()
           }
         })
       },
+      lawsTechnologyEvaluationItem() {
+        getAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/list', {
+          lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId,
+          actiProcInstId: this.$route.query.prcId,
+          createBy: this.userInfo().username
+        }).then((res) => {
+          if (res.success) {
+            this.evaluatorFeedbackList = res.result || []
+            this.loading = false
+          } else {
+            this.evaluatorFeedbackList = []
+            this.loading = false
+          }
+          this.isDisplay = true
+        })
+      },
       lawsOpinionAssessmentResult() {
         getAction(this.url.list, {
           lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId,

From 2373bcdef528710e7cb794be6aed2cfe4f40a149 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 13 Jul 2022 18:37:10 +0800
Subject: [PATCH 061/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=9D=A1=E6=AC=BE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...wsTechnologyEvaluationItemResultEOController.java |  6 ++++--
 ...ILawsTechnologyEvaluationItemResultEOService.java |  6 +++++-
 ...sTechnologyEvaluationFlowDetailEOServiceImpl.java | 10 ++++++++++
 ...sTechnologyEvaluationItemResultEOServiceImpl.java | 12 ++++++++++--
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java
index ccf5dcd61..2375580d2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java
@@ -68,8 +68,10 @@ public class LawsTechnologyEvaluationItemResultEOController extends JeroControll
 	@AutoLog(value = "法规技术评估-条款信息评估结果表-列表查询")
     @ApiOperation(value="法规技术评估-条款信息评估结果表-列表查询", notes="法规技术评估-条款信息评估结果表-列表查询")
 	@GetMapping(value = "/list")
-	public Result<List<LawsTechnologyEvaluationItemResultEO>> queryList() {
-        List<LawsTechnologyEvaluationItemResultEO> list = lawsTechnologyEvaluationItemResultEOService.queryList();
+	public Result<List<LawsTechnologyEvaluationItemResultEO>> queryList(LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO,
+																		HttpServletRequest req,
+																		String cut) {
+        List<LawsTechnologyEvaluationItemResultEO> list = lawsTechnologyEvaluationItemResultEOService.queryList(lawsTechnologyEvaluationItemResultEO,req,cut);
         return Result.OK(list);
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java
index bdc60abf2..8ab7d2844 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java
@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.jero.common.api.vo.Result;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationItemResultEO;
 import com.baomidou.mybatisplus.extension.service.IService;
+
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -59,7 +61,9 @@ public interface ILawsTechnologyEvaluationItemResultEOService extends IService<L
 	 *
 	 * @return
 	 */
-    List<LawsTechnologyEvaluationItemResultEO> queryList();
+    List<LawsTechnologyEvaluationItemResultEO> queryList(LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO,
+														 HttpServletRequest req,
+														 String cut);
 
 	/**
 	 * 流程调用
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java
index fb5429b62..beb0f70de 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationFlowDetailEOServiceImpl.java
@@ -2,6 +2,7 @@ package com.jero.modules.lawsTechnologyEvaluation.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
@@ -133,6 +134,15 @@ public class LawsTechnologyEvaluationFlowDetailEOServiceImpl extends ServiceImpl
 			if(CollectionUtils.isNotEmpty(detailList)){
 				this.saveBatch(detailList);
 			}
+		}else if(StringUtils.equals(operatorType, OperatorTypeEnum.QUERY.getValue())){
+			String lawsTechnologyEvaluationId = jsonObject.getString("lawsTechnologyEvaluationId");
+			QueryWrapper<LawsTechnologyEvaluationFlowDetailEO> queryWrapper = new QueryWrapper<>();
+			queryWrapper.lambda().eq(LawsTechnologyEvaluationFlowDetailEO::getLawsTechnologyEvaluationId,lawsTechnologyEvaluationId);
+			List<LawsTechnologyEvaluationFlowDetailEO> lawsTechnologyEvaluationFlowDetailEOS = this.baseMapper.selectList(queryWrapper);
+			Result<List<LawsTechnologyEvaluationFlowDetailEO>> objectResult = new Result<>();
+			objectResult.setResult(lawsTechnologyEvaluationFlowDetailEOS);
+			objectResult.setSuccess(true);
+			return objectResult;
 		}
 
 		return new Result<>().success("调用成功！");
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java
index 9980664e8..03c4f4053 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java
@@ -2,8 +2,10 @@ package com.jero.modules.lawsTechnologyEvaluation.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationItemResultEO;
 import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationItemResultEOMapper;
@@ -21,6 +23,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @Description: 法规技术评估-条款信息评估结果表
  * @Author: jero-boot
@@ -97,8 +101,12 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl
 	 * @return
 	 */
 	@Override
-    public List<LawsTechnologyEvaluationItemResultEO> queryList() {
-        return list();
+    public List<LawsTechnologyEvaluationItemResultEO> queryList(LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO,
+																HttpServletRequest req,
+																String cut) {
+		QueryWrapper<LawsTechnologyEvaluationItemResultEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationItemResultEO, req.getParameterMap());
+		List<LawsTechnologyEvaluationItemResultEO> itemResultEOList = this.baseMapper.selectList(queryWrapper);
+		return itemResultEOList;
     }
 
 	/**

From 0cca632e440be798fc28cd4ab86f705ee4fd6681 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 13 Jul 2022 18:48:19 +0800
Subject: [PATCH 062/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=9D=A1=E6=AC=BE=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=E8=A1=A8-=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=AE=8C=E5=96=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ologyEvaluationItemResultEOController.java |  1 +
 .../LawsTechnologyEvaluationItemResultEO.java |  3 ++
 ...chnologyEvaluationItemResultEOService.java |  2 +
 ...logyEvaluationItemResultEOServiceImpl.java | 42 +++++++++++++++++++
 .../processForm/evaluationProcess/index.vue   |  1 -
 5 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java
index 2375580d2..eb34fe50e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java
@@ -72,6 +72,7 @@ public class LawsTechnologyEvaluationItemResultEOController extends JeroControll
 																		HttpServletRequest req,
 																		String cut) {
         List<LawsTechnologyEvaluationItemResultEO> list = lawsTechnologyEvaluationItemResultEOService.queryList(lawsTechnologyEvaluationItemResultEO,req,cut);
+        this.lawsTechnologyEvaluationItemResultEOService.disposeData(list,cut);
         return Result.OK(list);
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java
index 0ef568162..86ef20c82 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java
@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -85,6 +86,8 @@ public class LawsTechnologyEvaluationItemResultEO implements Serializable {
 	@Excel(name = "评估方式", width = 15)
     @ApiModelProperty(value = "评估方式")
     private java.lang.String evaluationMethods;
+	@TableField(exist = false)
+    private java.lang.String evaluationMethodsName;
 
 	/**技术文件名称*/
 	@Excel(name = "技术文件名称", width = 15)
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java
index 8ab7d2844..e0eaf3b76 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java
@@ -77,4 +77,6 @@ public interface ILawsTechnologyEvaluationItemResultEOService extends IService<L
 	 * @param jsonObject
 	 */
 	void batchUpdate(JSONObject jsonObject);
+
+    void disposeData(List<LawsTechnologyEvaluationItemResultEO> datas, String cut);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java
index 03c4f4053..c7ab70d02 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.api.vo.Result;
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
@@ -12,13 +13,19 @@ import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluation
 import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationItemResultEOService;
 import com.jero.modules.project.enums.OperatorTypeEnum;
 import com.jero.modules.project.enums.RequestSourceEnum;
+import com.jero.modules.system.entity.SysCategory;
+import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Date;
+import java.util.stream.Collectors;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,6 +42,9 @@ import javax.servlet.http.HttpServletRequest;
 @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
 public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl<LawsTechnologyEvaluationItemResultEOMapper, LawsTechnologyEvaluationItemResultEO> implements ILawsTechnologyEvaluationItemResultEOService {
 
+	@Autowired
+	private SysCategoryServiceImpl sysCategoryService;
+
 	/**
 	 * 保存
 	 *
@@ -158,4 +168,36 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl
 			this.updateBatchById(itemResultEOList);
 		}
 	}
+
+	@Override
+	public void disposeData(List<LawsTechnologyEvaluationItemResultEO> datas, String cut) {
+		if(CollectionUtils.isNotEmpty(datas)){
+			List<SysCategory> categoryList = sysCategoryService.list();
+			for (LawsTechnologyEvaluationItemResultEO data : datas) {
+				String evaluationMethods = data.getEvaluationMethods();
+				List<String> evaluationMethodsList = Arrays.asList(evaluationMethods.split(","));
+				String name = getTreeName(cut, categoryList, evaluationMethodsList);
+				data.setEvaluationMethodsName(name);
+			}
+		}
+	}
+
+	private String getTreeName(String cut, List<SysCategory> categoryList, List<String> evaluationMethodsList) {
+		StringBuilder sb = new StringBuilder();
+		for (String evaluationMethods : evaluationMethodsList) {
+			List<SysCategory> collect = categoryList.stream().filter(e -> evaluationMethods.equals(e.getId())).collect(Collectors.toList());
+			if(collect.size() != 0){
+				if (CutEnum.CN.getValue().equals(cut)) {
+					sb.append(collect.get(0).getName() + ",");
+				} else {
+					sb.append(collect.get(0).getEnName()+ ",");
+				}
+			}
+		}
+		String evaluationMethodsName = "";
+		if (StringUtils.isNotBlank(sb)) {
+			evaluationMethodsName = sb.substring(0, sb.length() - 1);
+		}
+		return evaluationMethodsName;
+	}
 }
diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
index c7e7b5d10..b7769855b 100644
--- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
@@ -175,7 +175,6 @@
         getAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/list', {
           lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId,
           actiProcInstId: this.$route.query.prcId,
-          createBy: this.userInfo().username
         }).then((res) => {
           if (res.success) {
             this.evaluatorFeedbackList = res.result || []

From 333eb6d0f72479689a1fefd7db1d40314422db5c Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 14 Jul 2022 09:22:24 +0800
Subject: [PATCH 063/103] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?=
 =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/parameter/parameterlist/components/addModel.vue  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index 705be6cec..345a424a1 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -163,7 +163,9 @@
                       :title="$t('NcontrolType')">{{$t('NcontrolType')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="controlType">
-                  <a-select :placeholder="$t('PleaseSelect')+$t('NcontrolType')" allowClear v-model="formInline.controlType">
+                  <a-select :placeholder="$t('PleaseSelect')+$t('NcontrolType')"
+                            @change="controlTypeChange"
+                            allowClear v-model="formInline.controlType">
                     <a-select-option v-for="(item, key) in controlType" :key="key" :value="item.value">
                     <span style="display: inline-block;width: 100%" :title=" item.label ">
                       {{ item.label }}
@@ -466,6 +468,9 @@ export default {
         }
       })
     },
+    controlTypeChange(value){
+         this.$refs.ruleForm.clearValidate(['controlVerify','titleDefaultValue','controlValues'])
+    },
     uploadSuccess(data) {
       let attIdList = []
       if (data && data.length > 0) {

From da3f684f9ee5a3bc6dd0e7e0e3ee86103ce0852f Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 14 Jul 2022 10:08:40 +0800
Subject: [PATCH 064/103] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95=E5=A2=9E=E5=8A=A0=E9=AB=98=E7=BA=A7?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/tableCollection/index.vue  |   7 +-
 .../ParameterItemCollectionList.vue           | 129 ++++++++++++------
 2 files changed, 93 insertions(+), 43 deletions(-)

diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 1399e3518..fb66f9bdc 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -161,6 +161,10 @@
         type: Object,
         default: true
       },
+      queryParamQuery: {
+        type: Object,
+        default: true
+      },
       currentPersonRole: {
         type: String,
         default: true
@@ -591,7 +595,8 @@
           pageSize: this.pageSize,
           userTypes: this.currentPersonRole || currentPersonRole,
           paramsManifestId: paramsManifestid,
-          ...this.formInline
+          ...this.formInline,
+          ...currentPersonRole
         }
         this.loading = true
         getAction(url, params).then((res) => {
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index a81744a55..99c19a08b 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -33,17 +33,17 @@
                                v-model="formInline.paramsName"></a-input>
                     </div>
                   </a-col>
-                  <a-col :md="6" :sm="8">
-                    <div class="box-title-text">
-                      <div class="title-text" :title="$t('certificationCategory')">
-                        <span>{{$t('certificationCategory')}}</span>
-                      </div>
-                      <j-dict-select-tag class="box-input" v-model="formInline.certCategory"
-                                         :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
-                                         :type="'select'"
-                                         :triggerChange="false" :dictCode="'cert_category'"/>
-                    </div>
-                  </a-col>
+<!--                  <a-col :md="6" :sm="8">-->
+<!--                    <div class="box-title-text">-->
+<!--                      <div class="title-text" :title="$t('certificationCategory')">-->
+<!--                        <span>{{$t('certificationCategory')}}</span>-->
+<!--                      </div>-->
+<!--                      <j-dict-select-tag class="box-input" v-model="formInline.certCategory"-->
+<!--                                         :placeholder="$t('PleaseSelect')+$t('certificationCategory')"-->
+<!--                                         :type="'select'"-->
+<!--                                         :triggerChange="false" :dictCode="'cert_category'"/>-->
+<!--                    </div>-->
+<!--                  </a-col>-->
                   <a-col :md="6" :sm="8">
                     <div class="box-title-text">
                       <div class="title-text" :title="$t('areaOfResponsibility')">
@@ -64,29 +64,32 @@
                                v-model="formInline.dre"></a-input>
                     </div>
                   </a-col>
-                  <a-col :md="6" :sm="8">
-                    <div class="box-title-text">
-                      <div class="title-text" :title="$t('status')">
-                        <span>{{$t('status')}}</span>
-                      </div>
-                      <a-select :placeholder="$t('PleaseSelect')+$t('status')"
-                                class="box-input"
-                                allowClear
-                                :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                                v-model="formInline.state">
-                        <a-select-option v-for="(item, key) in statusList"
-                                         :key="key"
-                                         :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.name ">
-                           {{ item.name}}
-                     </span>
-                        </a-select-option>
-                      </a-select>
-                    </div>
-                  </a-col>
+<!--                  <a-col :md="6" :sm="8">-->
+<!--                    <div class="box-title-text">-->
+<!--                      <div class="title-text" :title="$t('status')">-->
+<!--                        <span>{{$t('status')}}</span>-->
+<!--                      </div>-->
+<!--                      <a-select :placeholder="$t('PleaseSelect')+$t('status')"-->
+<!--                                class="box-input"-->
+<!--                                allowClear-->
+<!--                                :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                                v-model="formInline.state">-->
+<!--                        <a-select-option v-for="(item, key) in statusList"-->
+<!--                                         :key="key"-->
+<!--                                         :value="item.value">-->
+<!--                     <span style="display: inline-block;width: 100%" :title=" item.name ">-->
+<!--                           {{ item.name}}-->
+<!--                     </span>-->
+<!--                        </a-select-option>-->
+<!--                      </a-select>-->
+<!--                    </div>-->
+<!--                  </a-col>-->
                   <span style="float: right;overflow: hidden;margin-right: 11px"
                         class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
+                 <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                      @handleSuperQuery="handleSuperQuery"
+                                      :fieldList="fieldList"/>
                   <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-col>
@@ -187,7 +190,7 @@
           <div style="width: 100%">
             <!-- 表格-10控件-->
             <table-collection ref="CollectionTabel" :url='url' :paramsManifest='paramsManifest' @rowValue='rowValue'
-                              :formInline='formInline' :currentPersonRole='currentPersonRole'
+                              :formInline='formInline' :queryParamQuery='queryParamQuery' :currentPersonRole='currentPersonRole'
                               @getDataSource="getDataSource"
                               @handlePreservation="handlePreservation"
                               @value='value'
@@ -391,6 +394,7 @@
   import TableCollection from '@/components/tableCollection/index'
   import { getAction, postAction } from '../../../api/manage'
   import ParameterLibraryAdd from '@/components/ParameterLibraryAdd/index'
+  import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
   import SynchronousSubmissionLibrary from '@/components/SynchronousSubmissionLibrary/index'
   import TaskCutOffTime from '@/components/TaskCutOffTime/index'
   import ReferenceParameter from '@/components/ReferenceParameter/index'
@@ -408,45 +412,55 @@
       AssignedBy,
       TaskCutOffTime,
       ReferenceParameter,
-      SynchronousSubmissionLibrary
+      SynchronousSubmissionLibrary,
+      globalAdvancedQuery
     },
     data() {
       this.statusList = [
         {
           value: '1',
-          name: this.$t('CollectionInitiated')
+          title: this.$t('CollectionInitiated'),
+          key:'1',
         },
         {
           value: '2',
-          name: this.$t('handledInterface')
+          title: this.$t('handledInterface'),
+          key:'2',
         },
         {
           value: '3',
-          name: this.$t('ReturnedPerson')
+          title: this.$t('ReturnedPerson'),
+          key:'3',
         },
         {
           value: '4',
-          name: this.$t('completed')
+          title: this.$t('completed'),
+          key:'4',
         },
         {
           value: '5',
-          name: this.$t('Filledreturn')
+          title: this.$t('Filledreturn'),
+          key:'5',
         },
         {
           value: '6',
-          name: this.$t('Submitted')
+          title: this.$t('Submitted'),
+          key:'6',
         },
         {
           value: '7',
-          name: this.$t('ReturnedEngineer')
+          title: this.$t('ReturnedEngineer'),
+          key:'7',
         },
         {
           value: '8',
-          name: this.$t('SynchronizedLibrary')
+          title: this.$t('SynchronizedLibrary'),
+          key:'8',
         },
         {
           value: '9',
-          name: this.$t('alteration')
+          title: this.$t('alteration'),
+          key:'9',
         }
       ]
       return {
@@ -502,9 +516,24 @@
             scopedSlots: { customRender: 'operation' }
           }
         ],
+        fieldList: [
+          {
+            type: '',
+            value: 'attestationType',
+            text: this.$t('certificationCategory'),
+            dictCode: 'cert_category'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          },
+          {
+            type: '',
+            value: 'attestationRank',
+            text: this.$t('status'),
+            options: this.statusList//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          },
+        ],
         selectedRowKeys: [],
         textLoading: false,
         formInline: {},
+        queryParamQuery:{},
         url: {
           tableHeader: 'params/collectManifest/getHeader',
           tableList: 'params/collectManifest/list',
@@ -740,6 +769,20 @@
           return flag
         }
       },
+      // 高级搜索
+      handleSuperQuery(params, matchType) {
+        let sqp = {}
+        if (!params || (params && params.length == 0)) {
+          sqp['superQueryParams'] = ''
+          this.$refs.globalAdvancedQueryRef.superQueryFlag = false
+        } else {
+          this.$refs.globalAdvancedQueryRef.superQueryFlag = true
+          sqp['superQueryParams'] = encodeURI(JSON.stringify(params))
+          sqp['superQueryMatchType'] = matchType
+        }
+        this.queryParamQuery = sqp
+        this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
+      },
       // 认证工程师 批量删除 权限
       // 仅仅状态为 待发起收集 工程接口人退回 变更 可以批量删除
       homoJurisdictionBatchdelete() {
@@ -1392,6 +1435,8 @@
       },
       searchReset() {
         this.$refs.CollectionTabel.getTableListReset()
+        this.$refs.globalAdvancedQueryRef.resetLine()
+        this.$refs.globalAdvancedQueryRef.emitCallback()
       },
       // 批量删除 -- 与下发收集一致
       handleDelJurisdiction() {

From 51977b5214611da309980d54ab53ca4edff582b2 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 14 Jul 2022 10:20:18 +0800
Subject: [PATCH 065/103] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=8F=98=E6=9B=B4=EF=BC=9A?=
 =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=8F=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOController.java    | 22 ++++++++++++--
 .../IParamsCollectManifestEOService.java      |  4 ++-
 .../ParamsCollectManifestEOServiceImpl.java   | 30 +++++++++++++++++++
 3 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
index aed81c064..3020e8abf 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
@@ -5,20 +5,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
-import com.jero.common.aspect.annotation.PermissionData;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
 import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
-import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -279,6 +276,25 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 		}
 	}
 
+	/**
+	 *  修改责任领域
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-修改责任领域")
+	@ApiOperation(value="参数项收集清单-修改责任领域", notes="参数项收集清单-修改责任领域")
+	@PostMapping(value = "/updateDutyTerritory")
+//	@RequiresPermissions("params:collectManifest:sdt")
+	public Result<?> updateDutyTerritory(ParamsCollectManifestVO paramsCollectManifestVO) {
+		boolean isSuccess = paramsCollectManifestEOService.updateDutyTerritory(paramsCollectManifestVO);
+		if (isSuccess) {
+			return Result.OK("修改责任领域成功！");
+		} else {
+			return Result.error("修改责任领域失败！");
+		}
+	}
+
 	/**
 	 *  分配工程接口人
 	 *
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
index fce085305..d41c37cf2 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
-import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
 
 import java.util.List;
 import java.util.Map;
@@ -116,6 +115,9 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
 	// 批量设置截止时间
 	boolean updateDeadlineBatch(ParamsCollectManifestVO paramsCollectManifestVO);
 
+	// 修改责任领域
+	boolean updateDutyTerritory(ParamsCollectManifestVO paramsCollectManifestVO);
+
 	// 修改工程接口人
 	boolean updateSdt(ParamsCollectManifestVO paramsCollectManifestVO);
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 10ea4fc41..f44f6b9f1 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -1178,6 +1178,36 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		return updateBatchById(updateEOList);
 	}
 
+	@Override
+	public boolean updateDutyTerritory(ParamsCollectManifestVO paramsCollectManifestVO) {
+		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())
+				|| StringUtils.isEmpty(paramsCollectManifestVO.getProjectId())
+				|| StringUtils.isEmpty(paramsCollectManifestVO.getDutyTerritory())) {
+			throw new JeroBootException("参数不能为空！");
+		}
+		String paramsCollectManifestId = paramsCollectManifestVO.getIds();
+		String projectId = paramsCollectManifestVO.getProjectId();
+		String dutyTerritory = paramsCollectManifestVO.getDutyTerritory();
+
+		ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
+		updateEO.setId(paramsCollectManifestId);
+		updateEO.setDutyTerritory(dutyTerritory);
+
+		// 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
+		ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(projectId, dutyTerritory);
+		if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) {
+			String sdtId = projectRelatedPersonnel.getEngineeringInterfacePerson();
+			if (org.apache.commons.lang.StringUtils.isNotBlank(sdtId) && !sdtId.contains(",")) { // 领域中仅有一个人时，添加该字段
+				SysUser sysUser = sysUserService.getById(sdtId);
+				if (ObjectUtil.isNotEmpty(sysUser)) {
+					updateEO.setSdt(sysUser.getUsername()); // 设置工程接口人
+				}
+			}
+		}
+
+		return updateById(updateEO);
+	}
+
 	@Override
 	public boolean updateSdt(ParamsCollectManifestVO paramsCollectManifestVO) {
 		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds()) || StringUtils.isEmpty(paramsCollectManifestVO.getSdt())) {

From 4b47cce99820c4a2fce1e19bd3b973dfba4a4635 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 14 Jul 2022 10:36:27 +0800
Subject: [PATCH 066/103] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=8F=98=E6=9B=B4=EF=BC=9A?=
 =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=8F=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ParamsCollectManifestEOServiceImpl.java       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index f44f6b9f1..651291499 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -641,6 +641,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			if ("description".equals(dbFieldName)) {
 				indexOfDescription = i;
 			}
+			if ("duty_territory".equals(dbFieldName)) {
+				map.put("type", true);
+			}
 			if ("sdt".equals(dbFieldName)) {
 				map.put("click", true);
 			}

From 5df29212273b489e571a2c3504c1c7f227795302 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 14 Jul 2022 10:49:31 +0800
Subject: [PATCH 067/103] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=8F=98=E6=9B=B4=EF=BC=9A?=
 =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=8F=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ParamsCollectManifestEOServiceImpl.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 651291499..ffaca6260 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -642,7 +642,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				indexOfDescription = i;
 			}
 			if ("duty_territory".equals(dbFieldName)) {
-				map.put("type", true);
+				map.put("click1", true);
 			}
 			if ("sdt".equals(dbFieldName)) {
 				map.put("click", true);

From d6c1da31529a0b82cd929320c0d5aa7c45bc495f Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 14 Jul 2022 11:02:04 +0800
Subject: [PATCH 068/103] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=8F=98=E6=9B=B4=EF=BC=9A?=
 =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=8F=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ParamsCollectManifestEOServiceImpl.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index ffaca6260..5f77dae15 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -1184,13 +1184,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 	@Override
 	public boolean updateDutyTerritory(ParamsCollectManifestVO paramsCollectManifestVO) {
 		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())
-				|| StringUtils.isEmpty(paramsCollectManifestVO.getProjectId())
+				|| StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId())
 				|| StringUtils.isEmpty(paramsCollectManifestVO.getDutyTerritory())) {
 			throw new JeroBootException("参数不能为空！");
 		}
 		String paramsCollectManifestId = paramsCollectManifestVO.getIds();
-		String projectId = paramsCollectManifestVO.getProjectId();
 		String dutyTerritory = paramsCollectManifestVO.getDutyTerritory();
+		ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsCollectManifestVO.getParamsManifestId());
+		String projectId = paramsManifestEO.getProjectId();
 
 		ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
 		updateEO.setId(paramsCollectManifestId);

From 860270eba81c5d262c08bc4d110d929e838aef59 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 14 Jul 2022 11:05:33 +0800
Subject: [PATCH 069/103] =?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

---
 jero-web/src/common/lang/en-us.js             |   2 +
 jero-web/src/common/lang/zh-cn.js             |   2 +
 .../components/TermInformation.vue            |   1 -
 .../components/standardDecompositionSheet.vue |   1 -
 .../components/evaluatorFeedbackList.vue      | 223 ++++++++++++++++--
 .../processForm/evaluationProcess/index.vue   |  60 ++++-
 6 files changed, 265 insertions(+), 24 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 1dc0d3d5c..ff30c7a53 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1132,4 +1132,6 @@ module.exports = {
   standardDocuments:'Standard documents',
   pleaseCompleteTheEvaluationMethodorEvaluator:'Please complete the evaluation method or evaluator in the list',
   reviewComments:'Review comments',
+  PleaseCompleteList:'Please complete the compliance results in the list',
+  sponsorFeedback:'Sponsor feedback',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 4c6a71b22..6325d941d 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1136,4 +1136,6 @@ module.exports = {
   standardDocuments:'标准文件',
   pleaseCompleteTheEvaluationMethodorEvaluator:'请补全列表中评估方式或评估人',
   reviewComments:'审核意见',
+  PleaseCompleteList:'请补全列表中符合性结果',
+  sponsorFeedback:'发起人反馈',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
index 620a72018..8233a6a36 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
@@ -87,7 +87,6 @@
             title: this.$t('clauseContent'),
             dataIndex: 'itemContent',
             align: 'center',
-            ellipsis: true,
             scopedSlots: { customRender: 'clauseContent' }
           },
           {
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue
index d7d0a0c65..0496bf0a7 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue
@@ -123,7 +123,6 @@
             title: this.$t('clauseContent'),
             dataIndex: 'iterms_conditions',
             align: 'center',
-            ellipsis: true,
             scopedSlots: { customRender: 'clauseContent' }
           },
           {
diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
index bd94d2b08..c8365ad06 100644
--- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
+++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
@@ -22,21 +22,81 @@
             <div class="clauseContent-text" v-html="text"></div>
           </a-tooltip>
         </div>
+
+        <span slot="nameTechnicalDocument" slot-scope="text,result">
+              <a-input class="box-input"
+                       :maxLength="100"
+                       v-model="result.technicalFileName"
+                       :placeholder="$t('PleaseEnter')+$t('nameTechnicalDocument')"/>
+        </span>
+        <span slot="chapter" slot-scope="text,result">
+           <a-textarea :placeholder="$t('pleaseEnter')+$t('chapter')"
+                       v-model="result.section"
+                       :maxLength="300"
+                       :rows="2"/>
+        </span>
+        <span slot="opinion" slot-scope="text,result">
+          <a-textarea :placeholder="$t('pleaseEnter')+$t('opinion')"
+                      v-model="result.opinion"
+                      :maxLength="300"
+                      :rows="2"/>
+        </span>
+        <span slot="enclosure" slot-scope="text,result,index">
+                    <a-button type="primary" class="button-text"
+                              @click="clickButtonToUpload('accessoryFile',index)">
+                    {{ (result.accessoryFile === 'null' || result.accessoryFile === '' ||
+                    result.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                    }}
+                  </a-button>
+        </span>
+        <span slot="complianceResults" slot-scope="text,result">
+              <a-select :placeholder="$t('PleaseSelect')+$t('complianceResults')"
+                        class="box-input"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        v-model="result.complianceResult">
+                  <a-select-option v-for="(item, key) in complianceResultsList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title="item.name ">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+        </span>
+        <span slot="accessoryFile" slot-scope="text,result">
+               <a v-if="text" @click="accessoryFileClick(text)">
+                    {{ $t('viewFile') }}
+               </a>
+               <span v-else>--</span>
+        </span>
+        <span slot="Results" slot-scope="text,result">
+           {{text == 'Compliance' ? $t('accord'):$t('nonConformity')}}
+        </span>
+        <span slot="sponsorFeedback" slot-scope="text,result">
+             <a-textarea :placeholder="$t('pleaseEnter')+$t('sponsorFeedback')"
+                         v-model="result.sponsorFeedback"
+                         :maxLength="300"
+                         :rows="2"/>
+        </span>
       </a-table>
     </div>
     <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
+    <viewFileModel ref="viewFileModelRef"/>
   </div>
 </template>
 
 <script>
   import { getAction, postAction } from '@/api/manage'
   import uploadFile from '@/components/uploadFile/file'
+  import viewFileModel from '@/components/viewFileModel/index'
 
   export default {
     name: 'evaluatorFeedback',
 
     components: {
-      uploadFile
+      uploadFile,
+      viewFileModel
     },
     props: {
       title: {
@@ -56,61 +116,154 @@
         loading: false,
         uploadIndex: '',
         dataSource: [],
-        columns: [
+        complianceResultsList: [
+          {
+            name: this.$t('accord'),
+            value: 'Compliance'
+          },
+          {
+            name: this.$t('nonConformity'),
+            value: 'Non-Compliance'
+          }
+        ],
+        columnsTwo: [
           {
             title: this.$t('clauseNo'),
             dataIndex: 'itemNum',
             align: 'center',
+            width: 180,
             ellipsis: true
           },
           {
             title: this.$t('clauseName'),
             dataIndex: 'itemName',
             align: 'center',
+            width: 180,
             ellipsis: true
           },
           {
             title: this.$t('clauseContent'),
             dataIndex: 'itemContent',
             align: 'center',
-            ellipsis: true,
+            width: 280,
             scopedSlots: { customRender: 'clauseContent' }
           },
           {
             title: this.$t('evaluationMethod'),
-            dataIndex: 'evaluationMethod',
+            dataIndex: 'evaluationMethodsName',
             align: 'center',
+            width: 180,
             ellipsis: true
           },
           {
             title: this.$t('nameTechnicalDocument'),
-            dataIndex: 'nameTechnicalDocument',
+            dataIndex: 'technicalFileName',
             align: 'center',
+            width: 280,
+            scopedSlots: { customRender: 'nameTechnicalDocument' }
+          },
+          {
+            title: this.$t('chapter'),
+            dataIndex: 'section',
+            align: 'center',
+            width: 180,
+            scopedSlots: { customRender: 'chapter' }
+          },
+          {
+            title: this.$t('opinion'),
+            dataIndex: 'opinion',
+            align: 'center',
+            width: 180,
+            scopedSlots: { customRender: 'opinion' }
+          },
+          {
+            title: this.$t('enclosure'),
+            dataIndex: 'accessoryFile',
+            align: 'center',
+            width: 180,
+            scopedSlots: { customRender: 'enclosure' }
+          },
+          {
+            title: this.$t('complianceResults'),
+            dataIndex: 'complianceResult',
+            align: 'center',
+            width: 180,
+            scopedSlots: { customRender: 'complianceResults' }
+          }
+        ],
+        columnsThree: [
+          {
+            title: this.$t('clauseNo'),
+            dataIndex: 'itemNum',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseName'),
+            dataIndex: 'itemName',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseContent'),
+            dataIndex: 'itemContent',
+            align: 'center',
+            width: 280,
+            scopedSlots: { customRender: 'clauseContent' }
+          },
+          {
+            title: this.$t('evaluationMethod'),
+            dataIndex: 'evaluationMethodsName',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('nameTechnicalDocument'),
+            dataIndex: 'technicalFileName',
+            align: 'center',
+            width: 280,
             ellipsis: true
           },
           {
             title: this.$t('chapter'),
-            dataIndex: 'chapter',
+            dataIndex: 'section',
             align: 'center',
+            width: 180,
             ellipsis: true
           },
           {
             title: this.$t('opinion'),
             dataIndex: 'opinion',
             align: 'center',
+            width: 180,
             ellipsis: true
           },
           {
             title: this.$t('enclosure'),
-            dataIndex: 'enclosure',
+            dataIndex: 'accessoryFile',
             align: 'center',
-            ellipsis: true
+            width: 180,
+            ellipsis: true,
+            scopedSlots: { customRender: 'accessoryFile' }
           },
           {
             title: this.$t('complianceResults'),
-            dataIndex: 'complianceResults',
+            dataIndex: 'complianceResult',
             align: 'center',
-            ellipsis: true
+            width: 180,
+            ellipsis: true,
+            scopedSlots: { customRender: 'Results' }
+          },
+          {
+            title: this.$t('sponsorFeedback'),
+            dataIndex: 'sponsorFeedback',
+            align: 'center',
+            width: 180,
+            ellipsis: true,
+            scopedSlots: { customRender: 'sponsorFeedback' }
           }
         ]
       }
@@ -118,6 +271,21 @@
     mounted() {
       if (this.evaluatorFeedbackList && this.evaluatorFeedbackList.length > 0) {
         this.dataSource = this.evaluatorFeedbackList
+        if (this.$route.query.taskDefinitionKey != 'pgrqr') {
+          this.dataSource.forEach(res => {
+            res.sponsorFeedback = ''
+          })
+          this.dataSource = [...this.dataSource]
+        }
+      }
+    },
+    computed: {
+      columns() {
+        if (this.$route.query.taskDefinitionKey == 'pgrqr') {
+          return this.columnsTwo
+        } else {
+          return this.columnsThree
+        }
       }
     },
     methods: {
@@ -126,7 +294,7 @@
         this.$refs.uploadFile.visible = true
         this.uploadName = item
         this.uploadIndex = index
-        getAction('sys/common/getFileInfos', { id: this.dataList[this.uploadIndex][this.uploadName] }).then((res) => {
+        getAction('sys/common/getFileInfos', { id: this.dataSource[this.uploadIndex][this.uploadName] }).then((res) => {
           if (res.success) {
             this.$refs.uploadFile.perentHandleFunc(res.result)
           } else {
@@ -143,8 +311,23 @@
           })
         }
         /** 赋值给当前对应的表单文件 */
-        this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
-        this.dataList = [...this.dataList]
+        this.dataSource[this.uploadIndex][this.uploadName] = attIdList.join(',')
+        this.dataSource = [...this.dataSource]
+      },
+      submitData(callBack) {
+        for (let i = 0; i < this.dataSource.length; i++) {
+          if (!this.dataSource[i].complianceResult) {
+            this.$message.warning(this.$t('PleaseCompleteList'))
+            return
+          }
+        }
+        callBack && callBack(this.dataSource)
+      },
+      preservationData(callBack) {
+        callBack && callBack(this.dataSource)
+      },
+      accessoryFileClick(item) {
+        this.$refs.viewFileModelRef.clickButtonToUpload(item)
       }
     }
   }
@@ -214,7 +397,7 @@
 
   .button-text {
     height: 38px;
-    width: calc(100% - 100px);
+    width: calc(100%);
     line-height: 38px;
     background: #fff;
     border: 1px #00B3BE solid;
@@ -233,6 +416,7 @@
     margin-left: 8px;
     cursor: pointer;
   }
+
   .clauseContent-text {
     width: 100%;
     overflow: hidden;
@@ -245,4 +429,15 @@
     text-justify: inter-ideograph;
     word-break: break-all
   }
+
+</style>
+<style>
+  .box-input .ant-select-selection--single {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+    height: 38px;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
index b7769855b..9a9aadbb3 100644
--- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
@@ -78,7 +78,7 @@
         isPreservation: false,
         isSendBack: false,
         isTrue: false,
-        standardContentList:[],
+        standardContentList: [],
         standardContent: [
           {
             title: this.$t('standard'),
@@ -110,7 +110,7 @@
             value: 'processBackground'
           }
         ],
-        evaluatorFeedback:[
+        evaluatorFeedback: [
           {
             title: this.$t('standard'),
             value: 'serialNumber'
@@ -137,7 +137,7 @@
             title: this.$t('processBackground'),
             value: 'processBackground'
           }
-        ],
+        ]
       }
     },
     mounted() {
@@ -174,7 +174,7 @@
       lawsTechnologyEvaluationItem() {
         getAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/list', {
           lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId,
-          actiProcInstId: this.$route.query.prcId,
+          actiProcInstId: this.$route.query.prcId
         }).then((res) => {
           if (res.success) {
             this.evaluatorFeedbackList = res.result || []
@@ -206,8 +206,39 @@
       },
       preservation() {
         this.loading = true
-        this.$refs.evaluatorFeedbackRef.preservationData((res) => {
-          this.insertBatch(res, 1)
+        if (this.isTrue) {
+          this.$refs.evaluatorFeedbackListRef.preservationData((res) => {
+            this.batchUpdate(res, 1)
+          })
+        } else {
+          this.$refs.evaluatorFeedbackRef.preservationData((res) => {
+            this.insertBatch(res, 1)
+          })
+        }
+      },
+      batchUpdate(val, num) {
+        let query = {
+          actiProcInstId: this.$route.query.prcId,
+          lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId,
+          itemResultList: val
+        }
+        postAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/batchUpdate', query).then((res) => {
+          if (res.success) {
+            if (num == 1) {
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.loading = false
+            } else {
+              if (this.queryProject.msg) {
+                delete this.queryProject.msg
+              }
+              this.completeTask()
+            }
+          } else {
+            if (num == 1) {
+              this.loading = false
+              this.$message.warning(this.$t('operationFailed'))
+            }
+          }
         })
       },
       insertBatch(val, num) {
@@ -235,7 +266,11 @@
       },
       sendBack() {
         if (this.isTrue) {
-
+          this.$refs.evaluatorFeedbackListRef.preservationData((res) => {
+            this.loading = true
+            this.queryProject.flag = '2'
+            this.batchUpdate(res, 2)
+          })
         } else {
           this.$refs.evaluatorFeedbackRef.preservationData((res) => {
             this.loading = true
@@ -247,7 +282,16 @@
       },
       submit() {
         if (this.isTrue) {
-
+          this.$refs.evaluatorFeedbackListRef.submitData((res) => {
+            if (this.$route.query.taskDefinitionKey == 'pgrqr') {
+              this.loading = true
+              this.batchUpdate(res, 2)
+            } else {
+              this.loading = true
+              this.queryProject.flag = '1'
+              this.batchUpdate(res, 2)
+            }
+          })
         } else {
           this.$refs.evaluatorFeedbackRef.submitData((res) => {
             if (this.$route.query.taskDefinitionKey == 'pgrqr') {

From d7be39abe62f8fe8802a1cd1c0abc929bb5bb32a Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 14 Jul 2022 11:09:30 +0800
Subject: [PATCH 070/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=AF=B9=E6=8E=A5=E3=80=82=20=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0=E5=88=B0=E8=BE=BE?=
 =?UTF-8?q?=E6=88=AA=E6=AD=A2=E6=97=A5=E6=9C=9F=E5=AE=9A=E6=97=B6=E5=99=A8?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsProcessHistoryEOServiceImpl.java |  9 ++-
 .../LawsTechnologyEvaluationEOController.java |  2 +-
 .../job/LawsTechnologyEvaluationJob.java      | 80 +++++++++++++++++++
 .../job/LawsTechnologyEvaluationNodeEnum.java | 63 +++++++++++++++
 ...LawsTechnologyEvaluationEOServiceImpl.java | 11 +--
 .../processForm/evaluationProcess/index.vue   |  3 +-
 6 files changed, 154 insertions(+), 14 deletions(-)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationJob.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationNodeEnum.java

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java
index a8e64f79f..0196e3a53 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java
@@ -11,10 +11,12 @@ import com.jero.modules.lawsOpinionGather.enums.LawsOpinionGatherNodeEnum;
 import com.jero.modules.lawsOpinionGather.enums.OperatorRoleCodeEnum;
 import com.jero.modules.lawsOpinionGather.mapper.LawsProcessHistoryEOMapper;
 import com.jero.modules.lawsOpinionGather.service.ILawsProcessHistoryEOService;
+import com.jero.modules.lawsTechnologyEvaluation.job.LawsTechnologyEvaluationNodeEnum;
 import com.jero.modules.project.enums.OperatorTypeEnum;
 import com.jero.modules.project.enums.RequestSourceEnum;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
+import com.jero.modules.wkflow.enums.FlowTypeEnum;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -120,9 +122,12 @@ public class LawsProcessHistoryEOServiceImpl extends ServiceImpl<LawsProcessHist
 				if(StringUtils.isNotEmpty(data.getOperatorRoleCode())){
 					data.setOperatorRoleName(OperatorRoleCodeEnum.getTextByValue(data.getOperatorRoleCode(),cut));
 				}
-
 				if(StringUtils.isNotEmpty(data.getTaskDefinitionKey())){
-					data.setTaskDefinitionKeyName(LawsOpinionGatherNodeEnum.getTextByValue(data.getTaskDefinitionKey(),cut));
+					if(StringUtils.equals(data.getFlowType(), FlowTypeEnum.FGYJSJLC.getValue())){
+						data.setTaskDefinitionKeyName(LawsOpinionGatherNodeEnum.getTextByValue(data.getTaskDefinitionKey(),cut));
+					}else if(StringUtils.equals(data.getFlowType(),FlowTypeEnum.FGJSPG.getValue())){
+						data.setTaskDefinitionKeyName(LawsTechnologyEvaluationNodeEnum.getTextByValue(data.getTaskDefinitionKey(),cut));
+					}
 				}
 			});
 		}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
index 747a2c2f5..2ba73e8c3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
@@ -205,7 +205,7 @@ public class LawsTechnologyEvaluationEOController extends JeroController<LawsTec
 
 	 @AutoLog(value = "条款导入")
 	 @ApiOperation(value = "条款导入")
-	 @GetMapping(value = "/importItemExcel")
+	 @PostMapping(value = "/importItemExcel")
 	 public List<Map<String,Object>> importItemExcel(MultipartFile file, @RequestParam(name = "cut") String cut, HttpServletRequest request) throws Exception {
 		 List<Map<String,Object>> result = this.lawsTechnologyEvaluationEOService.importItemExcel(file,cut,request);
 		 return result;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationJob.java
new file mode 100644
index 000000000..43d11a9a9
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationJob.java
@@ -0,0 +1,80 @@
+package com.jero.modules.lawsTechnologyEvaluation.job;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jero.common.api.vo.Result;
+import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
+import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService;
+import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationFlowDetailEOService;
+import com.jero.modules.wkflow.feginClient.WorkFlowFeignClient;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.jeecg.modules.jmreport.common.constant.CommonConstant;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 法规技术评估 - 定时器
+ *      作用：当前日期大于等于截止日志的时候，把该数据的流程状态，更新为已完成，同时把当前这条数据的所有待办任务提交
+ */
+@Slf4j
+public class LawsTechnologyEvaluationJob implements Job {
+
+    @Autowired
+    private ILawsTechnologyEvaluationEOService lawsTechnologyEvaluationEOService;
+    @Autowired
+    private ILawsTechnologyEvaluationFlowDetailEOService lawsTechnologyEvaluationFlowDetailEOService;
+    @Autowired
+    private WorkFlowFeignClient workFlowFeignClient;
+
+    @Override
+    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+        log.info("法规技术评估流程，定时任务开启 =====================================================");
+
+        QueryWrapper<LawsTechnologyEvaluationEO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(LawsTechnologyEvaluationEO::getFlowStatus, GatherResultEnum.UNDERWAY.getValue());
+        List<LawsTechnologyEvaluationEO> lawsTechnologyEvaluationEOList = this.lawsTechnologyEvaluationEOService.list(queryWrapper);
+
+        if (CollectionUtils.isNotEmpty(lawsTechnologyEvaluationEOList)) {
+            Date currentDate = new Date();
+            //过滤截止日期小于当前日期的法规技术评估数据
+            List<LawsTechnologyEvaluationEO> updateLawsTechnologyEvaluationEOList = lawsTechnologyEvaluationEOList.stream().filter(e -> {
+                boolean flag = false;
+                if(currentDate.after(e.getEndTime())){
+                    flag = true;
+                }
+                return flag;
+            }).collect(Collectors.toList());
+
+            if(CollectionUtils.isNotEmpty(updateLawsTechnologyEvaluationEOList)){
+                List<String> lawsTechnologyEvaluationIdList = updateLawsTechnologyEvaluationEOList.stream().map(LawsTechnologyEvaluationEO::getId).distinct().collect(Collectors.toList());
+
+                //获取这些法规技术评估数据的下级流程明细数据。
+                QueryWrapper<LawsTechnologyEvaluationFlowDetailEO> flowDetailEOQueryWrapper = new QueryWrapper<>();
+                flowDetailEOQueryWrapper.lambda().in(LawsTechnologyEvaluationFlowDetailEO::getLawsTechnologyEvaluationId,lawsTechnologyEvaluationIdList);
+                List<LawsTechnologyEvaluationFlowDetailEO> lawsTechnologyEvaluationFlowDetailEOList = lawsTechnologyEvaluationFlowDetailEOService.list(flowDetailEOQueryWrapper);
+
+                if(CollectionUtils.isNotEmpty(lawsTechnologyEvaluationFlowDetailEOList)){
+                    String actiProcInstIds = lawsTechnologyEvaluationFlowDetailEOList.stream().map(LawsTechnologyEvaluationFlowDetailEO::getActiProcInstId).distinct().collect(Collectors.joining(","));
+                    Result<String> result = this.workFlowFeignClient.completeTaskByPids(actiProcInstIds);
+                    if(result.getCode().equals(CommonConstant.SC_OK_200)){
+                        updateLawsTechnologyEvaluationEOList.forEach(lawsTechnologyEvaluationEO -> {
+                            lawsTechnologyEvaluationEO.setFlowStatus(GatherResultEnum.COMPLETED.getValue());
+                        });
+                        this.lawsTechnologyEvaluationEOService.updateBatchById(updateLawsTechnologyEvaluationEOList);
+                    }
+                }
+
+            }
+        }
+
+        log.info("法规技术评估流程，定时任务结束 =====================================================");
+    }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationNodeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationNodeEnum.java
new file mode 100644
index 000000000..745cb58d4
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationNodeEnum.java
@@ -0,0 +1,63 @@
+package com.jero.modules.lawsTechnologyEvaluation.job;
+
+import com.alibaba.druid.util.StringUtils;
+import com.jero.common.constant.enums.CutEnum;
+
+/**
+ * 法规技术评估 节点枚举类
+ */
+public enum LawsTechnologyEvaluationNodeEnum {
+
+    ENGINEER_INITIATED("fggcsfq","法规工程师发起","Engineer initiated"),
+    APPRAISERS_EVALUATION("pgrqr","评估人评估","Appraiser's evaluation"),
+    SPONSOR_REVIEW("fqrsc","发起人审查","Sponsor review"),
+    ;
+
+    String key;
+    String cnName;
+    String enName;
+
+    private LawsTechnologyEvaluationNodeEnum(String key, String cnName, String enName) {
+        this.key = key;
+        this.cnName = cnName;
+        this.enName = enName;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getCnName() {
+        return cnName;
+    }
+
+    public void setCnName(String cnName) {
+        this.cnName = cnName;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+    public static String getTextByValue(String key,String cut) {
+        LawsTechnologyEvaluationNodeEnum[] values = values();
+        for (LawsTechnologyEvaluationNodeEnum lawsOpinionGatherNodeEnum : values) {
+            if (lawsOpinionGatherNodeEnum.key.equals(key)) {
+                if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+                    return lawsOpinionGatherNodeEnum.cnName;
+                }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+                    return lawsOpinionGatherNodeEnum.enName;
+                }
+            }
+        }
+        return null;
+    }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
index 08d0b962b..f621b8719 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
@@ -336,13 +336,6 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 			HSSFCellStyle cellStyleTemp = workbook.createCellStyle();
 			cellStyleTemp.setWrapText(true);//自动换行
 
-			int startLine = 0;
-			int endLine = 4;
-			//合并单元格
-			CellRangeAddress region1 =
-					new CellRangeAddress(1, 1, startLine, endLine); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
-			sheet.addMergedRegion(region1);
-
 			String explainInfo = null;
 
 			HSSFRichTextString explain = new HSSFRichTextString(explainInfo);
@@ -354,12 +347,12 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 				row.createCell(m).setCellValue(headerArr[m]);
 			}
 
-			Row rowExplain = sheet.createRow(1);
+			/*Row rowExplain = sheet.createRow(1);
 			short height = (short) (7 * 200);
 			rowExplain.setHeight((short) height);
 			Cell cell = rowExplain.createCell(0);
 			cell.setCellValue(explain);
-			cell.setCellStyle(cellStyleTemp);
+			cell.setCellStyle(cellStyleTemp);*/
 
 			response.setHeader("Content-Disposition",
 					"attachment; filename=\"" + fileOriName + ".xls");
diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
index b7769855b..02d8a5757 100644
--- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
@@ -189,8 +189,7 @@
       lawsOpinionAssessmentResult() {
         getAction(this.url.list, {
           lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId,
-          actiProcInstId: this.$route.query.prcId,
-          createBy: this.userInfo().username
+          actiProcInstId: this.$route.query.prcId
         }).then((res) => {
           if (res.success) {
             this.complianceResult = res.result.complianceResult || {}

From 39de9c3e76f2594c6b7401b21445541c8ffe67b6 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 14 Jul 2022 11:21:37 +0800
Subject: [PATCH 071/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-=E5=8F=91=E8=B5=B7?=
 =?UTF-8?q?=E4=BA=BA=E5=AE=A1=E6=9F=A5=EF=BC=8C=E8=8E=B7=E5=8F=96=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0=E4=BA=BA=E5=A1=AB=E5=86=99=E7=9A=84=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E6=80=A7=E7=BB=93=E6=9E=9C=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsTechnologyEvaluationResultEOServiceImpl.java        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java
index da8eebbee..e87455571 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java
@@ -157,7 +157,6 @@ public class LawsTechnologyEvaluationResultEOServiceImpl extends ServiceImpl<Law
 		QueryWrapper<LawsTechnologyEvaluationComplianceResultEO> complianceResultEOQueryWrapper = new QueryWrapper<>();
 		complianceResultEOQueryWrapper.lambda().eq(LawsTechnologyEvaluationComplianceResultEO::getActiProcInstId,lawsTechnologyEvaluationResultEO.getActiProcInstId());
 		complianceResultEOQueryWrapper.lambda().eq(LawsTechnologyEvaluationComplianceResultEO::getLawsTechnologyEvaluationId,lawsTechnologyEvaluationResultEO.getLawsTechnologyEvaluationId());
-		complianceResultEOQueryWrapper.lambda().eq(LawsTechnologyEvaluationComplianceResultEO::getCreateBy,lawsTechnologyEvaluationResultEO.getCreateBy());
 		List<LawsTechnologyEvaluationComplianceResultEO> complianceResultEOList = complianceResultEOService.list(complianceResultEOQueryWrapper);
 		if(CollectionUtils.isNotEmpty(complianceResultEOList)){
 			result.put("complianceResult",complianceResultEOList.get(0));

From 865afc8191a49443aeaa2128ba8d142e4ffe45f3 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 14 Jul 2022 11:30:11 +0800
Subject: [PATCH 072/103] =?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

---
 jero-web/src/common/lang/en-us.js             |   2 +
 jero-web/src/common/lang/zh-cn.js             |   2 +
 .../collectionOfRegulatoryOpinions/index.vue  |   2 +-
 .../components/processInformation.vue         | 141 ++++++++++++++++++
 .../technologyAssessment/index.vue            |  16 +-
 5 files changed, 152 insertions(+), 11 deletions(-)
 create mode 100644 jero-web/src/views/businessSupport/technologyAssessment/components/processInformation.vue

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index ff30c7a53..5a4951f95 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1134,4 +1134,6 @@ module.exports = {
   reviewComments:'Review comments',
   PleaseCompleteList:'Please complete the compliance results in the list',
   sponsorFeedback:'Sponsor feedback',
+  processNumber:'Process number',
+  processName:'Process Name',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 6325d941d..37bc3ed86 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1138,4 +1138,6 @@ module.exports = {
   reviewComments:'审核意见',
   PleaseCompleteList:'请补全列表中符合性结果',
   sponsorFeedback:'发起人反馈',
+  processNumber:'流程编号',
+  processName:'流程名称',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
index 5955cfc03..e342a2161 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
@@ -168,7 +168,7 @@
             align: 'center',
             width: 170,
             ellipsis: true,
-            dataIndex: 'technologyTerritory'
+            dataIndex: 'technologyTerritoryName'
           },
           {
             title: this.$t('collectResults'),
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/processInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/processInformation.vue
new file mode 100644
index 000000000..e5eb0a45a
--- /dev/null
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/processInformation.vue
@@ -0,0 +1,141 @@
+<template>
+  <a-modal
+    :title="$t('circulationHistory')"
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    @cancel="visible = false"
+  >
+    <template slot="footer">
+      <a-button key="back" @click="visible = false">
+        {{$t('cancel')}}
+      </a-button>
+    </template>
+    <a-table
+      class="table"
+      :columns="columns"
+      :pagination="false"
+      :scroll="{x:700,y: 400}"
+      :data-source="dataSource"
+      :loading="loading"
+    >
+        <span slot="fileOperation" slot-scope="record">
+           <a class="text" @click="preview(record)">
+             {{$t('See')}}
+          </a>
+        </span>
+    </a-table>
+    <div class="page" v-if="dataSource && dataSource.length > 0">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        :current="pageNo"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+  </a-modal>
+</template>
+
+<script>
+  import { getAction, putAction, downloadFile } from '@/api/manage'
+
+  export default {
+    name: 'processInformation',
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        visible: false,
+        pageSize: 10,
+        total: 0,
+        pageNo: 1,
+        lawsTechnologyEvaluationId: '',
+        columns: [
+          {
+            title: this.$t('processNumber'),
+            dataIndex: 'prcNum',
+            align: 'center',
+            width: 160,
+            ellipsis: true
+          },
+          {
+            title: this.$t('processName'),
+            dataIndex: 'prcName',
+            align: 'center',
+            width: 160,
+            ellipsis: true
+          },
+          {
+            title: this.$t('Assessor'),
+            dataIndex: 'evaluatorName',
+            align: 'center',
+            width: 160,
+            ellipsis: true
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            width: 130,
+            scopedSlots: { customRender: 'fileOperation' }
+          }
+        ]
+      }
+    },
+    methods: {
+      preview(row) {
+        let newUrl = this.$router.resolve({
+          path: '/processDetails',
+          query: {
+            prcNum: row.prcNum,
+            prcType: 6,
+            prcId: row.actiProcInstId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getData(row) {
+        this.visible = true
+        this.lawsTechnologyEvaluationId = row.id
+        this.getList()
+      },
+      getList() {
+        let query = {
+          lawsTechnologyEvaluationId: this.lawsTechnologyEvaluationId,
+          pageSize: this.pageSize,
+          pageNo: this.pageNo
+        }
+        this.loading = true
+        getAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationFlowDetailEO/page', query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+            this.dataSource = []
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
index eb9627cd0..52e936410 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
@@ -149,14 +149,18 @@
         </a-row>
       </a-form-model>
     </a-modal>
+    <processInformation ref="processInformationRef"/>
   </a-card>
 </template>
 
 <script>
   import { getAction, postAction } from '@/api/manage'
-
+  import processInformation from './components/processInformation'
   export default {
     name: 'index',
+    components:{
+      processInformation
+    },
     data() {
       return {
         //url传参严格按照当前命名
@@ -353,15 +357,7 @@
         })
       },
       viewProcessClick(row) {
-        let newUrl = this.$router.resolve({
-          path: '/processDetails',
-          query: {
-            prcNum: row.prcNum,
-            prcType: 6,
-            prcId: row.actiProcInstId
-          }
-        })
-        window.open(newUrl.href, '_blank')
+        this.$refs.processInformationRef.getData(JSON.parse(JSON.stringify(row)))
       },
       evaluationResultsClick(row) {
         let newUrl = this.$router.resolve({

From 6f2f5e42681920366cc3e5a470f2e53b4acbaff2 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 14 Jul 2022 11:31:48 +0800
Subject: [PATCH 073/103] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=8F=98=E6=9B=B4=EF=BC=9A?=
 =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=8F=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ParamsCollectManifestEOServiceImpl.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 5f77dae15..1d71cc22d 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -356,6 +356,12 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				});
 			}
 
+			// 处理负责领域
+			Map<String, Object> dutyTerritoryMap = new HashMap<>();
+			dutyTerritoryMap.put("state", collectManifestEO.getState());
+			dutyTerritoryMap.put("dataValue", collectManifestEO.getDutyTerritory());
+			manifestMap.put("dutyTerritory", dutyTerritoryMap);
+
 			// 处理工程接口人
 			Map<String, Object> sdtMap = new HashMap<>();
 			sdtMap.put("id", collectManifestEO.getId());

From 2d1a927c87a274745144cb75225e549bde8c86ba Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 14 Jul 2022 11:36:13 +0800
Subject: [PATCH 074/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=9D=A1=E6=AC=BE=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...LawsTechnologyEvaluationEOServiceImpl.java | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
index f621b8719..df16067d3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
@@ -394,17 +394,18 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 				int rowNos = sheet.getPhysicalNumberOfRows();// 得到excel的总记录条数
 				for (int i = 0; i < rowNos ; i++) {
 					Row row = sheet.getRow(i + 1);
-
-					String itemNum = row.getCell(0, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
-					String itemName = row.getCell(1, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
-					String itemContents = row.getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
-					Map<String,Object> itemInfoMap = new HashMap<>();
-					String itemId = UUID.randomUUID().toString().replace("-", "");
-					itemInfoMap.put("itemId",itemId);
-					itemInfoMap.put("itemNum",itemNum);
-					itemInfoMap.put("itemName",itemName);
-					itemInfoMap.put("itemContent",itemContents);
-					result.add(itemInfoMap);
+					if(row != null){
+						String itemNum = row.getCell(0, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
+						String itemName = row.getCell(1, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
+						String itemContents = row.getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
+						Map<String,Object> itemInfoMap = new HashMap<>();
+						String itemId = UUID.randomUUID().toString().replace("-", "");
+						itemInfoMap.put("itemId",itemId);
+						itemInfoMap.put("itemNum",itemNum);
+						itemInfoMap.put("itemName",itemName);
+						itemInfoMap.put("itemContent",itemContents);
+						result.add(itemInfoMap);
+					}
 				}
 			}
 		}

From 4e6539a9fdd50d4c48c9ad6bf6504c7b1ee57298 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 14 Jul 2022 11:42:46 +0800
Subject: [PATCH 075/103] update

---
 .../controller/LawsTechnologyEvaluationEOController.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
index 2ba73e8c3..fb3f82b0e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java
@@ -206,8 +206,8 @@ public class LawsTechnologyEvaluationEOController extends JeroController<LawsTec
 	 @AutoLog(value = "条款导入")
 	 @ApiOperation(value = "条款导入")
 	 @PostMapping(value = "/importItemExcel")
-	 public List<Map<String,Object>> importItemExcel(MultipartFile file, @RequestParam(name = "cut") String cut, HttpServletRequest request) throws Exception {
+	 public Result<?> importItemExcel(MultipartFile file, @RequestParam(name = "cut") String cut, HttpServletRequest request) throws Exception {
 		 List<Map<String,Object>> result = this.lawsTechnologyEvaluationEOService.importItemExcel(file,cut,request);
-		 return result;
+		 return Result.OK(result);
 	 }
 }

From 5f467c619f491b68199cc58e2112fd127c0ec1ef Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 14 Jul 2022 11:48:29 +0800
Subject: [PATCH 076/103] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=8F=98=E6=9B=B4=EF=BC=9A?=
 =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=8F=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/service/impl/ParamsCollectManifestEOServiceImpl.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 1d71cc22d..2bfbc4397 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -358,6 +358,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 			// 处理负责领域
 			Map<String, Object> dutyTerritoryMap = new HashMap<>();
+			dutyTerritoryMap.put("id", collectManifestEO.getId());
 			dutyTerritoryMap.put("state", collectManifestEO.getState());
 			dutyTerritoryMap.put("dataValue", collectManifestEO.getDutyTerritory());
 			manifestMap.put("dutyTerritory", dutyTerritoryMap);

From d48d63a8fd6122a2cbfadaa8523b90b3be639844 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 14 Jul 2022 11:53:15 +0800
Subject: [PATCH 077/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E5=8F=8D=E9=A6=88=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=20=E7=AC=A6=E5=90=88=E6=80=A7?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E8=A1=A8id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql               | 6 +++++-
 .../entity/LawsTechnologyEvaluationResultEO.java            | 3 +++
 .../impl/LawsTechnologyEvaluationResultEOServiceImpl.java   | 5 +++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index f93c831d4..42b9bed98 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -375,4 +375,8 @@ ALTER TABLE `laws_weilai`.`params_collect_manifest_history`
     ADD COLUMN `title_default_value` varchar(100) NULL COMMENT '标题默认值' AFTER `params_manifest_id`;
 
 ALTER TABLE `laws_weilai`.`params_report_detail`
-    ADD COLUMN `title_default_value` varchar(100) NULL COMMENT '标题默认值' AFTER `sync_time`;
\ No newline at end of file
+    ADD COLUMN `title_default_value` varchar(100) NULL COMMENT '标题默认值' AFTER `sync_time`;
+
+-- 法规技术评估 反馈评估表中，增加符合性结果表id关联  2022-07-14
+ALTER TABLE `laws_technology_evaluation_result`
+    ADD COLUMN `compliance_result_id` varchar(64) NULL COMMENT '符合性结果id' AFTER `acti_proc_inst_id`;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java
index 15b4a7998..36f1b37b9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java
@@ -93,4 +93,7 @@ public class LawsTechnologyEvaluationResultEO implements Serializable {
     @ApiModelProperty(value = "流程实例id")
     private java.lang.String actiProcInstId;
 
+    @ApiModelProperty(value = "符合性结果id")
+    private java.lang.String complianceResultId;
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java
index e87455571..fa773e1ad 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java
@@ -16,6 +16,8 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Date;
+import java.util.UUID;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -122,6 +124,8 @@ public class LawsTechnologyEvaluationResultEOServiceImpl extends ServiceImpl<Law
 		complianceResultEOService.remove(removeComplianceResultWrapper);
 
 		LawsTechnologyEvaluationComplianceResultEO complianceResultEO = new LawsTechnologyEvaluationComplianceResultEO();
+		String complianceResultId = UUID.randomUUID().toString().replace("-", "");
+		complianceResultEO.setId(complianceResultId);
 		complianceResultEO.setActiProcInstId(actiProcInstId);
 		complianceResultEO.setLawsTechnologyEvaluationId(lawsTechnologyEvaluationId);
 		complianceResultEO.setComplianceResult(complianceResult);
@@ -141,6 +145,7 @@ public class LawsTechnologyEvaluationResultEOServiceImpl extends ServiceImpl<Law
 			evaluationResultEO.setActiProcInstId(actiProcInstId);
 			evaluationResultEO.setLawsTechnologyEvaluationId(lawsTechnologyEvaluationId);
 			evaluationResultEO.setSubmitTime(new Date());
+			evaluationResultEO.setComplianceResultId(complianceResultId);
 			evaluationResultEOList.add(evaluationResultEO);
 		}
 		if(CollectionUtils.isNotEmpty(evaluationResultEOList)){

From 075312d7c5064877fcb95ba250547105d35ff300 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 14 Jul 2022 12:07:15 +0800
Subject: [PATCH 078/103] =?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

---
 jero-web/src/components/ImportFile/index.vue  |  2 +-
 .../components/TermInformation.vue            | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/components/ImportFile/index.vue b/jero-web/src/components/ImportFile/index.vue
index 159975470..21d8893ef 100644
--- a/jero-web/src/components/ImportFile/index.vue
+++ b/jero-web/src/components/ImportFile/index.vue
@@ -120,7 +120,7 @@
             })
             } else {
               if (this.isTrue) {
-                this.$emit('getList')
+                this.$emit('getList',info.file.response.result)
               } else {
                 eventBUs.$emit('searchReset')
               }
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
index 8233a6a36..5c9aa7475 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
@@ -109,6 +109,8 @@
           }
         ],
         dataList: [],
+        ImportFileData: [],
+        dataListData: [],
         loading: false
       }
     },
@@ -119,6 +121,12 @@
         this.dataList = this.dataList.filter(res => {
           return res.itemId != item.itemId
         })
+        this.dataListData = this.dataListData.filter(res => {
+          return res.itemId != item.itemId
+        })
+        this.ImportFileData = this.ImportFileData.filter(res => {
+          return res.itemId != item.itemId
+        })
         this.$emit('TermInformationRefForm', item)
       },
       PersonnelSelectionChange(value, id, index) {
@@ -126,10 +134,10 @@
         this.dataList = [...this.dataList]
       },
       getData(value) {
-        this.dataList = []
+        this.dataListData = []
         if (value && value.length > 0) {
           value.forEach(res => {
-            this.dataList.push({
+            this.dataListData.push({
               itemId: res.id,
               itemNum: res.items_num,
               itemName: res.items_name,
@@ -137,10 +145,13 @@
             })
           })
         }
+        this.dataList = this.ImportFileData.concat(this.dataListData)
         this.dataList = [...this.dataList]
       },
-      getPersonnelList() {
-
+      getPersonnelList(res) {
+        this.ImportFileData = this.ImportFileData.concat(res)
+        this.dataList = this.dataListData.concat(this.ImportFileData)
+        this.dataList = [...this.dataList]
       },
       getUUID() {
         var str = []

From a991958c527228589d70ba551594f26be60bec20 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 14 Jul 2022 12:11:02 +0800
Subject: [PATCH 079/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=9F=A5=E8=AF=A2=E5=8F=8D=E9=A6=88?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...valuationComplianceResultEOController.java |  8 ++--
 ...echnologyEvaluationComplianceResultEO.java |  8 ++--
 ...gyEvaluationComplianceResultEOService.java |  6 ++-
 ...aluationComplianceResultEOServiceImpl.java | 44 ++++++++++++++++++-
 4 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationComplianceResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationComplianceResultEOController.java
index 2cca22297..4d2b69ace 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationComplianceResultEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationComplianceResultEOController.java
@@ -35,7 +35,7 @@ import com.jero.common.aspect.annotation.AutoLog;
 public class LawsTechnologyEvaluationComplianceResultEOController extends JeroController<LawsTechnologyEvaluationComplianceResultEO, ILawsTechnologyEvaluationComplianceResultEOService> {
 	@Autowired
 	private ILawsTechnologyEvaluationComplianceResultEOService lawsTechnologyEvaluationComplianceResultEOService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -66,8 +66,10 @@ public class LawsTechnologyEvaluationComplianceResultEOController extends JeroCo
 	@AutoLog(value = "法规技术评估-评估人反馈-符合性结果表-列表查询")
     @ApiOperation(value="法规技术评估-评估人反馈-符合性结果表-列表查询", notes="法规技术评估-评估人反馈-符合性结果表-列表查询")
 	@GetMapping(value = "/list")
-	public Result<List<LawsTechnologyEvaluationComplianceResultEO>> queryList() {
-        List<LawsTechnologyEvaluationComplianceResultEO> list = lawsTechnologyEvaluationComplianceResultEOService.queryList();
+	public Result<List<LawsTechnologyEvaluationComplianceResultEO>> queryList(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO,
+																			  HttpServletRequest req,
+																			  @RequestParam(name="cut", defaultValue="cn") String cut) {
+        List<LawsTechnologyEvaluationComplianceResultEO> list = lawsTechnologyEvaluationComplianceResultEOService.queryList(lawsTechnologyEvaluationComplianceResultEO,req,cut);
         return Result.OK(list);
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationComplianceResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationComplianceResultEO.java
index d642d1c95..870313dd1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationComplianceResultEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationComplianceResultEO.java
@@ -1,21 +1,19 @@
 package com.jero.modules.lawsTechnologyEvaluation.entity;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
+import java.util.List;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 
 /**
@@ -76,4 +74,6 @@ public class LawsTechnologyEvaluationComplianceResultEO implements Serializable
     @ApiModelProperty(value = "流程实例id")
     private java.lang.String actiProcInstId;
 
+	@TableField(exist = false)
+	private List<LawsTechnologyEvaluationResultEO> lawsTechnologyEvaluationResultEOList;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationComplianceResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationComplianceResultEOService.java
index f93d11f0c..335fc9905 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationComplianceResultEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationComplianceResultEOService.java
@@ -2,6 +2,8 @@ package com.jero.modules.lawsTechnologyEvaluation.service;
 
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO;
 import com.baomidou.mybatisplus.extension.service.IService;
+
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -57,5 +59,7 @@ public interface ILawsTechnologyEvaluationComplianceResultEOService extends ISer
 	 *
 	 * @return
 	 */
-    List<LawsTechnologyEvaluationComplianceResultEO> queryList();
+    List<LawsTechnologyEvaluationComplianceResultEO> queryList(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO,
+															   HttpServletRequest req,
+															   String cut);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java
index 16849cd96..c95b3d3b2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java
@@ -1,15 +1,26 @@
 package com.jero.modules.lawsTechnologyEvaluation.service.impl;
 
+import com.alibaba.druid.util.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO;
 import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationComplianceResultEOMapper;
 import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationComplianceResultEOService;
+import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationResultEOService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.Date;
+import java.util.stream.Collectors;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @Description: 法规技术评估-评估人反馈-符合性结果表
  * @Author: jero-boot
@@ -19,6 +30,8 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
 public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends ServiceImpl<LawsTechnologyEvaluationComplianceResultEOMapper, LawsTechnologyEvaluationComplianceResultEO> implements ILawsTechnologyEvaluationComplianceResultEOService {
+	@Autowired
+	private ILawsTechnologyEvaluationResultEOService evaluationResultEOService;
 
 	/**
 	 * 保存
@@ -86,7 +99,34 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
 	 * @return
 	 */
 	@Override
-    public List<LawsTechnologyEvaluationComplianceResultEO> queryList() {
-        return list();
+    public List<LawsTechnologyEvaluationComplianceResultEO> queryList(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO,
+																	  HttpServletRequest req,
+																	  String cut) {
+		QueryWrapper<LawsTechnologyEvaluationComplianceResultEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationComplianceResultEO, req.getParameterMap());
+		List<LawsTechnologyEvaluationComplianceResultEO> complianceResultEOList = this.baseMapper.selectList(queryWrapper);
+
+		if(CollectionUtils.isNotEmpty(complianceResultEOList)){
+
+			List<String> complianceResultIdList = complianceResultEOList.stream().map(LawsTechnologyEvaluationComplianceResultEO::getId).distinct().collect(Collectors.toList());
+			QueryWrapper<LawsTechnologyEvaluationResultEO> evaluationResultEOQueryWrapper = new QueryWrapper<>();
+			evaluationResultEOQueryWrapper.lambda().in(LawsTechnologyEvaluationResultEO::getComplianceResultId,complianceResultIdList);
+			List<LawsTechnologyEvaluationResultEO> evaluationResultEOList = this.evaluationResultEOService.list(evaluationResultEOQueryWrapper);
+
+			if(CollectionUtils.isNotEmpty(evaluationResultEOList)){
+				for (LawsTechnologyEvaluationComplianceResultEO complianceResultEO : complianceResultEOList) {
+					List<LawsTechnologyEvaluationResultEO> lawsTechnologyEvaluationResultEOList = evaluationResultEOList.stream().filter(evaluationResultEO ->{
+						boolean flag = false;
+						if(StringUtils.equals(complianceResultEO.getId(),evaluationResultEO.getComplianceResultId())){
+							flag = true;
+						}
+						return flag;
+					}).collect(Collectors.toList());
+
+					complianceResultEO.setLawsTechnologyEvaluationResultEOList(lawsTechnologyEvaluationResultEOList);
+				}
+			}
+
+		}
+		return complianceResultEOList;
     }
 }

From 6a3598724116d7c0b22a3fa67b3000ed7cc06b2b Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 14 Jul 2022 13:46:21 +0800
Subject: [PATCH 080/103] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95-=E5=A2=9E=E5=8A=A0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/tableCollection/index.vue  | 130 +++++++++++++++++-
 .../ParameterItemCollectionList.vue           |  14 +-
 2 files changed, 136 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index fb66f9bdc..2b1172fe2 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -31,7 +31,7 @@
            <span
              v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更" || record.state == "Wait Collect" || record.state == "Sdt Back" || record.state == "Change"'>
              <span
-               @click='ondataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
+               @click='areaOfResponsibility(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
            </span>
              <span v-else>
              <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
@@ -41,6 +41,23 @@
              <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
            </span>
          </span>
+        <span slot="operationzr" slot-scope="record">
+           <span v-if='currentPersonRole === "homo"'>
+<!--           认证工程师  -->
+           <span
+             v-if='record.state == "待发起收集" || record.state == "工程接口人退回"'>
+             <span
+               @click='ondataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined')? '--': record.dataValue }}</span>
+           </span>
+             <span v-else>
+             <span @click='dataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined')? '--': record.dataValue }}</span>
+           </span>
+           </span>
+           <span v-else>
+             <span @click='dataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined')? '--': record.dataValue }}</span>
+           </span>
+         </span>
+
         <span slot="detailClick" slot-scope="text,record">
           <collection-type :detailDate='text'/>
         </span>
@@ -95,6 +112,46 @@
         </div>
       </div>
     </a-modal>
+    <!--  修改责任领域--->
+    <a-modal v-model="areaVisiblezr" :title="$t('areaOfResponsibility')" width='620px' :footer="null"
+             @cancel="cancel">
+      <a-form-model
+        class='tag-module'
+        ref='ruleForm'
+        :model='Dateline'
+        :rules='rules'
+        :label-col='labelCol'
+        :wrapper-col='wrapperCol'
+
+      >
+        <a-row :gutter='24'>
+          <a-col :span='24'>
+            <a-form-model-item ref='region' :label="$t('areaOfResponsibility')" prop='queryzr'>
+<!--              <a-select allowClear :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"-->
+<!--                        v-model="Dateline.querySdt">-->
+<!--                <a-select-option v-for="(item, key) in querySdtList" :key="key" :value="item.value">-->
+<!--                    <span style="display: inline-block;width: 100%" :title=" item.label ">-->
+<!--                      {{ item.label }}-->
+<!--                    </span>-->
+<!--                </a-select-option>-->
+<!--              </a-select>-->
+              <j-dict-select-tag class="box-input" v-model="Dateline.queryzr"
+                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'duty_territory'"/>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+      <div class="imports-footer">
+        <div class="imports-footer-wrap">
+
+          <a-button class="imports-btn imports-sub" type="primary" @click="handleSubmitzr">{{$t('preservation')}}
+          </a-button>
+          <a-button class="imports-btn" type="primary" @click="cancel">{{$t('cancel')}}</a-button>
+        </div>
+      </div>
+    </a-modal>
     <!--  配置信息--->
     <a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null">
       <div class="content-text">
@@ -236,6 +293,7 @@
         sdt: 0, // 工程接口人
         dre: 0, // 填写人
         areaVisible: false,
+        areaVisiblezr:false,
         form: {},
         rules: {
           querySdt: [
@@ -244,6 +302,13 @@
               message: this.$t('PleaseSelect') + this.$t('engineeringInterfacePerson'),
               trigger: 'change'
             }
+          ],
+          queryzr: [
+            {
+              required: true,
+              message: this.$t('PleaseSelect') + this.$t('areaOfResponsibility'),
+              trigger: 'change'
+            }
           ]
         },
         wrapperCol: {
@@ -346,6 +411,44 @@
           }
         })
       },
+      // 责任领域 保存
+      handleSubmitzr(record) {
+        let _this = this
+        let param = { dutyTerritory: this.Dateline.queryzr, ids: this.getquerySdtId,paramsManifestId: this.$route.query.id, }
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            axios({
+              url: '/jero-boot/params/collectManifest/updateDutyTerritory',
+              method: 'post',
+              data: param,
+              transformRequest: [function(data) {
+                let ret = ''
+                for (let it in data) {
+                  ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+                }
+                return ret
+              }],
+              headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+                'X-Access-Token': _this.token
+              }
+            })
+              .then((res) => {
+                console.log(res)
+                if (res.data.success) {
+                  _this.$message.success(_this.$t('OperationSuccessful'))
+                  _this.areaVisiblezr = false
+                  this.getTableList()
+                } else {
+                  _this.$message.warning(_this.$t('operationFailed'))
+                }
+              })
+              .catch((error) => {
+                console.log(error)
+              })
+          }
+        })
+      },
       // 工程接口人 保存
       handleSubmit(record) {
         let _this = this
@@ -389,8 +492,12 @@
         this.areaVisible = false
         this.$refs['ruleForm'].resetFields()
       },
+      cancel(){
+        this.areaVisiblezr = false
+        this.$refs['ruleForm'].resetFields()
+      },
       // 点击工程接口人的详情人员 有权限
-      ondataValueTobeinitiated(record) {
+      areaOfResponsibility(record) {
         this.areaVisible = true
         // this.$refs.ruleForm.clearValidate()
         this.$nextTick(() => {
@@ -399,9 +506,22 @@
           this.$refs.ruleForm.clearValidate()
         })
       },
+      // 点击责任领域的详情人员 有权限
+      ondataValueTobe(record) {
+        this.areaVisiblezr = true
+        // this.$refs.ruleForm.clearValidate()
+        this.$nextTick(() => {
+          this.Dateline = { ...this.Dateline }
+          this.getquerySdtId = record.id
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
       dataValueTobeinitiated() {
         this.$message.warning(this.$t('certifiedEngineer') + this.$t('and') + this.$t('Statusis') + this.$t('CollectionInitiated') + this.$t('ReturnedPerson') + this.$t('alteration') + this.$t('toHavePermission'))
       },
+      dataValueTobe() {
+        this.$message.warning(this.$t('certifiedEngineer') + this.$t('and') + this.$t('Statusis') + this.$t('CollectionInitiated') + this.$t('ReturnedPerson') + this.$t('toHavePermission'))
+      },
       // 点击工程接口人的详情人员 无权限
       ondataValueNot() {
         this.$message.warning(this.$t('operatethisbutton'))
@@ -491,9 +611,15 @@
                   sorter: res.sort,
                   width: 160
                 })
+                console.log(res)
                 this.columns[index].scopedSlots = {
                   customRender: 'titleName'
                 }
+                if(res.click1){
+                  this.columns[index].scopedSlots = {
+                    customRender: 'operationzr'
+                  }
+                }
                 if (res.click) {
                   // 工程接口人列表修改
                   this.columns[index].scopedSlots = {
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 99c19a08b..46e74f812 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -20,8 +20,8 @@
                       <div class="title-text" :title="$t('newNiONumber')">
                         <span>{{$t('newNiONumber')}}</span>
                       </div>
-                      <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('newNiONumber')"
-                               v-model="formInline.nioNumber"></a-input>
+                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('newNiONumber')"
+                               v-model="formInline.nioNumber"></j-input>
                     </div>
                   </a-col>
                   <a-col :md="6" :sm="8">
@@ -29,8 +29,8 @@
                       <div class="title-text" :title="$t('ParameterName')">
                         <span>{{$t('ParameterName')}}</span>
                       </div>
-                      <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ParameterName')"
-                               v-model="formInline.paramsName"></a-input>
+                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ParameterName')"
+                               v-model="formInline.paramsName"></j-input>
                     </div>
                   </a-col>
 <!--                  <a-col :md="6" :sm="8">-->
@@ -60,8 +60,8 @@
                       <div class="title-text" :title="$t('completedBy')">
                         <span>{{$t('completedBy')}}</span>
                       </div>
-                      <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('completedBy')"
-                               v-model="formInline.dre"></a-input>
+                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('completedBy')"
+                               v-model="formInline.dre"></j-input>
                     </div>
                   </a-col>
 <!--                  <a-col :md="6" :sm="8">-->
@@ -87,7 +87,9 @@
                   <span style="float: right;overflow: hidden;margin-right: 11px"
                         class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
+<!--                 v-if="this.$route.query.it === undefined"-->
                  <globalAdvancedQuery ref="globalAdvancedQueryRef"
+
                                       @handleSuperQuery="handleSuperQuery"
                                       :fieldList="fieldList"/>
                   <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>

From 8fa2aecd40947dc26137a2cbeb9524463c98e295 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 14 Jul 2022 13:51:14 +0800
Subject: [PATCH 081/103] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ParameterItemCollectionList.vue                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 46e74f812..39e5754e7 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -521,13 +521,13 @@
         fieldList: [
           {
             type: '',
-            value: 'attestationType',
+            value: 'certCategory',
             text: this.$t('certificationCategory'),
             dictCode: 'cert_category'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
           },
           {
             type: '',
-            value: 'attestationRank',
+            value: 'state',
             text: this.$t('status'),
             options: this.statusList//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
           },

From 2e2f239a278ea9675f8ef994afcd53e6e415596c Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 14 Jul 2022 14:17:12 +0800
Subject: [PATCH 082/103] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=8F=98=E6=9B=B4=EF=BC=9A?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOController.java    | 23 +++++++--------
 ...amsCollectManifestHistoryEOController.java | 28 ++++++++++---------
 .../IParamsCollectManifestEOService.java      |  3 +-
 ...ParamsCollectManifestHistoryEOService.java |  6 ++--
 .../ParamsCollectManifestEOServiceImpl.java   | 26 +++++++++++++----
 ...msCollectManifestHistoryEOServiceImpl.java | 14 ++++++++--
 6 files changed, 63 insertions(+), 37 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
index 3020e8abf..682af6d01 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
@@ -74,19 +74,20 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 	public Result<?> queryList(ParamsCollectManifestEO paramsCollectManifestEO,
 							   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 							   @RequestParam(name="pageSize", defaultValue="100") Integer pageSize,
-							   @RequestParam(name = "cut") String cut) {
-		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) {
-			paramsCollectManifestEO.setNioNumber(paramsCollectManifestEO.getNioNumber().replace("%","\\%"));
-		}
-		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getParamsName())) {
-			paramsCollectManifestEO.setParamsName(paramsCollectManifestEO.getParamsName().replace("%","\\%"));
-		}
-		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getDre())) {
-			paramsCollectManifestEO.setDre(paramsCollectManifestEO.getDre().replace("%","\\%"));
-		}
+							   @RequestParam(name = "cut") String cut,
+							   HttpServletRequest req) {
+//		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) {
+//			paramsCollectManifestEO.setNioNumber(paramsCollectManifestEO.getNioNumber().replace("%","\\%"));
+//		}
+//		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getParamsName())) {
+//			paramsCollectManifestEO.setParamsName(paramsCollectManifestEO.getParamsName().replace("%","\\%"));
+//		}
+//		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getDre())) {
+//			paramsCollectManifestEO.setDre(paramsCollectManifestEO.getDre().replace("%","\\%"));
+//		}
 
 		IPage page = new Page(pageNo, pageSize);
-		IPage list = paramsCollectManifestEOService.queryList(page, paramsCollectManifestEO, cut);
+		IPage list = paramsCollectManifestEOService.queryList(page, paramsCollectManifestEO, cut, req);
         return Result.OK(list);
 	}
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestHistoryEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestHistoryEOController.java
index ba090fa7d..2bcab4ab6 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestHistoryEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestHistoryEOController.java
@@ -6,6 +6,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestHistoryEO;
 import com.jero.modules.cert.collect.entity.ParamsConfigHistoryEO;
 import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
 import com.jero.modules.cert.collect.service.IParamsCollectManifestHistoryEOService;
@@ -13,13 +14,13 @@ import com.jero.modules.cert.collect.service.IParamsConfigHistoryEOService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -66,22 +67,23 @@ public class ParamsCollectManifestHistoryEOController extends JeroController<Par
     @ApiOperation(value="历史参数项收集清单-列表查询", notes="历史参数项收集清单-列表查询")
 	@GetMapping(value = "/list")
 //	@RequiresPermissions("params:manifest:history")
-	public Result<?> queryList(ParamsCollectManifestEO paramsCollectManifestEO,
+	public Result<?> queryList(ParamsCollectManifestHistoryEO paramsCollectManifestHistoryEO,
 							   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 							   @RequestParam(name="pageSize", defaultValue="500") Integer pageSize,
-							   @RequestParam(name = "cut") String cut) {
-		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) {
-			paramsCollectManifestEO.setNioNumber(paramsCollectManifestEO.getNioNumber().replace("%","\\%"));
-		}
-		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getParamsName())) {
-			paramsCollectManifestEO.setParamsName(paramsCollectManifestEO.getParamsName().replace("%","\\%"));
-		}
-		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getDre())) {
-			paramsCollectManifestEO.setDre(paramsCollectManifestEO.getDre().replace("%","\\%"));
-		}
+							   @RequestParam(name = "cut") String cut,
+							   HttpServletRequest req) {
+//		if (StringUtils.isNotEmpty(paramsCollectManifestHistoryEO.getNioNumber())) {
+//			paramsCollectManifestHistoryEO.setNioNumber(paramsCollectManifestHistoryEO.getNioNumber().replace("%","\\%"));
+//		}
+//		if (StringUtils.isNotEmpty(paramsCollectManifestHistoryEO.getParamsName())) {
+//			paramsCollectManifestHistoryEO.setParamsName(paramsCollectManifestHistoryEO.getParamsName().replace("%","\\%"));
+//		}
+//		if (StringUtils.isNotEmpty(paramsCollectManifestHistoryEO.getDre())) {
+//			paramsCollectManifestHistoryEO.setDre(paramsCollectManifestHistoryEO.getDre().replace("%","\\%"));
+//		}
 
 		IPage page = new Page(pageNo, pageSize);
-		IPage list = paramsCollectManifestHistoryEOService.queryList(page, paramsCollectManifestEO, cut);
+		IPage list = paramsCollectManifestHistoryEOService.queryList(page, paramsCollectManifestHistoryEO, cut, req);
         return Result.OK(list);
 	}
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
index d41c37cf2..b86067b96 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -63,7 +64,7 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
 	 * @param cut
 	 * @return
 	 */
-	IPage queryList(IPage page, ParamsCollectManifestEO paramsCollectManifestEO, String cut);
+	IPage queryList(IPage page, ParamsCollectManifestEO paramsCollectManifestEO, String cut, HttpServletRequest req);
 
 	/**
 	 * 列表表头中英文切换
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java
index 8d97915fc..b84c3f009 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java
@@ -2,9 +2,9 @@ package com.jero.modules.cert.collect.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestHistoryEO;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -19,11 +19,11 @@ public interface IParamsCollectManifestHistoryEOService extends IService<ParamsC
 	/**
 	 * 列表查询
 	 * @param page
-	 * @param paramsCollectManifestEO
+	 * @param paramsCollectManifestHistoryEO
 	 * @param cut
 	 * @return
 	 */
-	IPage queryList(IPage page, ParamsCollectManifestEO paramsCollectManifestEO, String cut);
+	IPage queryList(IPage page, ParamsCollectManifestHistoryEO paramsCollectManifestHistoryEO, String cut, HttpServletRequest req);
 
 	/**
 	 * 列表表头中英文切换
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 2bfbc4397..16c1754a6 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -12,6 +12,7 @@ import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.constant.enums.MessageTypeEnum;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
 import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
@@ -61,6 +62,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
@@ -248,7 +250,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 	 * @return
 	 */
 	@Override
-    public IPage queryList(IPage page, ParamsCollectManifestEO paramsCollectManifestEO, String cut) {
+    public IPage queryList(IPage page, ParamsCollectManifestEO paramsCollectManifestEO, String cut, HttpServletRequest req) {
+		QueryWrapper<ParamsCollectManifestEO> queryWrapper = QueryGenerator.initQueryWrapper(paramsCollectManifestEO, req.getParameterMap());
+		queryWrapper.lambda().notIn(ParamsCollectManifestEO::getControlType, ControlTypeEnum.Title.getValue())
+				.orderByDesc(ParamsCollectManifestEO::getDelFlag)
+				.orderByDesc(ParamsCollectManifestEO::getAddFlag)
+				.orderByDesc(ParamsCollectManifestEO::getChangeFlag)
+				.orderByAsc(ParamsCollectManifestEO::getNioNumber);
+
 		String paramsManifestId = paramsCollectManifestEO.getParamsManifestId();
 
 		String userTypes = paramsCollectManifestEO.getUserTypes();
@@ -268,16 +277,21 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		}
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录用户
 		if ("sdt".equals(userTypes)) {
-			paramsCollectManifestEO.setSdt(loginUser.getUsername());
+//			paramsCollectManifestEO.setSdt(loginUser.getUsername());
+			queryWrapper.lambda().eq(ParamsCollectManifestEO::getSdt, loginUser.getUsername())
+					.in(ParamsCollectManifestEO::getState, '2','4','5','6','7','8');
 		} else if ("dre".equals(userTypes)) {
-			paramsCollectManifestEO.setDreForAuth(loginUser.getUsername());
-		} else if ("sdt,dre".equals(userTypes)) {
+//			paramsCollectManifestEO.setDreForAuth(loginUser.getUsername());
+			queryWrapper.lambda().eq(ParamsCollectManifestEO::getDre, loginUser.getUsername())
+					.in(ParamsCollectManifestEO::getState, '4','6','7','8');
+		}/* else if ("sdt,dre".equals(userTypes)) {
 			paramsCollectManifestEO.setSdt(loginUser.getUsername());
 			paramsCollectManifestEO.setDreForAuth(loginUser.getUsername());
-		} else if ("guest".equals(userTypes)) {
+		}*/ else if ("guest".equals(userTypes)) {
 			return page;
 		}
-		IPage pageInfo = paramsCollectManifestEOMapper.pageInfo(page, paramsCollectManifestEO); // 查询固定列
+//		IPage pageInfo = paramsCollectManifestEOMapper.pageInfo(page, paramsCollectManifestEO); // 查询固定列
+		IPage pageInfo = page(page, queryWrapper); // 查询固定列
 		List<ParamsCollectManifestEO> list = pageInfo.getRecords(); // 查询固定列
 		List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列
 		List<String> paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
index 9deb0dc6a..d15de9823 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
@@ -2,11 +2,13 @@ package com.jero.modules.cert.collect.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.constant.enums.YesOrNoEnum;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
 import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
 import com.jero.modules.cert.collect.entity.*;
@@ -27,6 +29,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -74,10 +77,15 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
 	 * @return
 	 */
 	@Override
-	public IPage queryList(IPage page, ParamsCollectManifestEO paramsCollectManifestEO, String cut) {
-		String paramsManifestId = paramsCollectManifestEO.getParamsManifestId();
+	public IPage queryList(IPage page, ParamsCollectManifestHistoryEO paramsCollectManifestHistoryEO, String cut, HttpServletRequest req) {
+		QueryWrapper<ParamsCollectManifestHistoryEO> queryWrapper = QueryGenerator.initQueryWrapper(paramsCollectManifestHistoryEO, req.getParameterMap());
+		queryWrapper.lambda().notIn(ParamsCollectManifestHistoryEO::getControlType, ControlTypeEnum.Title.getValue())
+				.orderByAsc(ParamsCollectManifestHistoryEO::getNioNumber);
 
-		IPage pageInfo = paramsCollectManifestHistoryEOMapper.pageInfo(page, paramsCollectManifestEO); // 查询固定列
+		String paramsManifestId = paramsCollectManifestHistoryEO.getParamsManifestId();
+
+		IPage pageInfo = page(page, queryWrapper); // 查询固定列
+//		IPage pageInfo = paramsCollectManifestHistoryEOMapper.pageInfo(page, paramsCollectManifestEO); // 查询固定列
 		List<ParamsCollectManifestHistoryEO> list = pageInfo.getRecords(); // 查询固定列
 		List<ParamsConfigHistoryEO> paramsConfigEOList = paramsConfigHistoryEOService.queryList(paramsManifestId); // 查询配置列
 		List<String> paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());

From 54a342082c54841a1ee54647a8079ede756f07e2 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 14 Jul 2022 14:21:58 +0800
Subject: [PATCH 083/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=9D=A1=E6=AC=BE=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ologyEvaluationItemResultEOController.java |  15 ++
 .../LawsTechnologyEvaluationItemResultEO.java |   4 +
 ...chnologyEvaluationItemResultEOService.java |   6 +
 ...logyEvaluationItemResultEOServiceImpl.java | 206 +++++++++++++++++-
 4 files changed, 226 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java
index eb34fe50e..1a435230f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java
@@ -2,6 +2,7 @@ package com.jero.modules.lawsTechnologyEvaluation.controller;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -160,6 +161,20 @@ public class LawsTechnologyEvaluationItemResultEOController extends JeroControll
         return super.exportXls(request, lawsTechnologyEvaluationItemResultEO, LawsTechnologyEvaluationItemResultEO.class, "法规技术评估-条款信息评估结果表");
     }
 
+	 /**
+	  * 导出zip压缩包，带文件。
+	  * @param response
+	  * @param request
+	  * @param lawsTechnologyEvaluationItemResultEO
+	  * @param params
+	  */
+	@RequestMapping(value = "/exportZip")
+	public void exportZip(HttpServletResponse response,HttpServletRequest request,
+						  LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO,
+						  @RequestParam Map<String,Object> params) {
+		this.lawsTechnologyEvaluationItemResultEOService.exportZip(response,request, lawsTechnologyEvaluationItemResultEO,params);
+	}
+
     /**
       * 通过excel导入数据
     *
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java
index 86ef20c82..c807864a6 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java
@@ -108,11 +108,15 @@ public class LawsTechnologyEvaluationItemResultEO implements Serializable {
 	@Excel(name = "附件", width = 15)
     @ApiModelProperty(value = "附件")
     private java.lang.String accessoryFile;
+	@TableField(exist = false)
+    private java.lang.String accessoryFileName;
 
 	/**符合性结果*/
 	@Excel(name = "符合性结果", width = 15)
     @ApiModelProperty(value = "符合性结果")
     private java.lang.String complianceResult;
+	@TableField(exist = false)
+    private java.lang.String complianceResultName;
 
 	/**评估人id*/
 	@Excel(name = "评估人id", width = 15)
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java
index e0eaf3b76..7dcfb9104 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationItemResultEOService.java
@@ -6,7 +6,9 @@ import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluation
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 法规技术评估-条款信息评估结果表
@@ -79,4 +81,8 @@ public interface ILawsTechnologyEvaluationItemResultEOService extends IService<L
 	void batchUpdate(JSONObject jsonObject);
 
     void disposeData(List<LawsTechnologyEvaluationItemResultEO> datas, String cut);
+
+	void exportZip(HttpServletResponse response, HttpServletRequest request, LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO, Map<String, Object> params);
+
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java
index c7ab70d02..cb1314e10 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java
@@ -1,29 +1,41 @@
 package com.jero.modules.lawsTechnologyEvaluation.service.impl;
 
+import cn.hutool.core.util.ZipUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.utils.IOUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.query.QueryGenerator;
-import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
+import com.jero.common.system.vo.LoginUser;
+import com.jero.common.util.oss.CosBootUtil;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationItemResultEO;
+import com.jero.modules.lawsTechnologyEvaluation.enums.ComplianceResultEnum;
 import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationItemResultEOMapper;
 import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationItemResultEOService;
+import com.jero.modules.oss.entity.OSSFile;
+import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.project.enums.OperatorTypeEnum;
 import com.jero.modules.project.enums.RequestSourceEnum;
 import com.jero.modules.system.entity.SysCategory;
 import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
+import com.jero.modules.system.util.PDFUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.shiro.SecurityUtils;
+import org.aspectj.util.FileUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Date;
+import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -31,6 +43,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * @Description: 法规技术评估-条款信息评估结果表
@@ -42,8 +55,12 @@ import javax.servlet.http.HttpServletRequest;
 @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
 public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl<LawsTechnologyEvaluationItemResultEOMapper, LawsTechnologyEvaluationItemResultEO> implements ILawsTechnologyEvaluationItemResultEOService {
 
+	@Value(value = "${jero.path.upload}")
+	private String uploadpath;
 	@Autowired
 	private SysCategoryServiceImpl sysCategoryService;
+	@Autowired
+	private IOSSFileService iOSSFileService;
 
 	/**
 	 * 保存
@@ -178,10 +195,189 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl
 				List<String> evaluationMethodsList = Arrays.asList(evaluationMethods.split(","));
 				String name = getTreeName(cut, categoryList, evaluationMethodsList);
 				data.setEvaluationMethodsName(name);
+				if(StringUtils.isNotEmpty(data.getComplianceResult())){
+					data.setComplianceResultName(ComplianceResultEnum.getTextByValue(data.getComplianceResult(),cut));
+				}
+
+				if(StringUtils.isNotEmpty(data.getAccessoryFile())){
+					List<OSSFile> accessoryFileList = iOSSFileService.getFileInfos(data.getAccessoryFile());
+					String accessoryFileName = accessoryFileList.stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
+					data.setAccessoryFileName(accessoryFileName);
+				}
 			}
 		}
 	}
 
+	@Override
+	public void exportZip(HttpServletResponse response, HttpServletRequest request, LawsTechnologyEvaluationItemResultEO lawsTechnologyEvaluationItemResultEO, Map<String, Object> params) {
+		String ids = (String)params.get("ids");
+		String cut = (String)params.get("cut");
+		QueryWrapper<LawsTechnologyEvaluationItemResultEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationItemResultEO, request.getParameterMap());
+		if(StringUtils.isNotEmpty(ids)){
+			List<String> idList = Arrays.asList(ids.split(","));
+			queryWrapper.lambda().in(LawsTechnologyEvaluationItemResultEO::getId,idList);
+		}
+		List<LawsTechnologyEvaluationItemResultEO> exportData = this.baseMapper.selectList(queryWrapper);
+		this.disposeData(exportData,cut);
+
+		String title = "";
+		String fileName = "";
+		if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+			title = "条款号,条款名称,条款内容,评估人,评估方式,技术文件名称,章节,符合性结果,意见,附件,反馈时间";
+			fileName = "条款评估结果 " + ".xlsx";
+		}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+			title = "Item num,Item name,Item Contents,Evaluator,Evaluation methods,Name of technical document,Section,Compliance results,Opinion,Accessory,Feedback time ";
+			fileName = "Item Evaluation results " + ".xlsx";
+		}
+
+		OutputStream os = null;
+		HSSFWorkbook workbook = new HSSFWorkbook();
+
+		String path = uploadpath + "/tempZip/itemEvaluationResults/" + System.currentTimeMillis();
+
+		try {
+			response.setHeader("Content-Disposition",
+					"attachment; filename=" + fileName);
+			response.setContentType("application/force-download");
+
+			HSSFSheet sheet = workbook.createSheet("sheet1");
+
+			CellStyle titleCellStyle = workbook.createCellStyle();
+			titleCellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中
+			titleCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//水平居中
+			titleCellStyle.setWrapText(true);//自动换行
+
+			Row firstRow = sheet.createRow(0);
+
+			//创建表头
+			String[] titleArr = title.split(",");
+			for (int i=0; i<=5; i++){
+				sheet.setColumnWidth(i,4000);
+				Cell cell = firstRow.createCell(i);
+				cell.setCellStyle(titleCellStyle);
+				cell.setCellValue(titleArr[i]);
+			}
+
+			//设置导出数据
+			if(CollectionUtils.isNotEmpty(exportData)) {
+				for (int dataIndex = 0; dataIndex < exportData.size(); dataIndex++) {
+					Row dataRow = sheet.createRow(dataIndex + 1);
+					dataRow.createCell(0).setCellValue(exportData.get(dataIndex).getItemNum());
+					dataRow.createCell(1).setCellValue(exportData.get(dataIndex).getItemName());
+					dataRow.createCell(2).setCellValue(exportData.get(dataIndex).getItemContent());
+					dataRow.createCell(3).setCellValue(exportData.get(dataIndex).getCreateBy());
+					dataRow.createCell(4).setCellValue(exportData.get(dataIndex).getEvaluationMethodsName());
+					dataRow.createCell(5).setCellValue(exportData.get(dataIndex).getTechnicalFileName());
+					dataRow.createCell(6).setCellValue(exportData.get(dataIndex).getSection());
+					dataRow.createCell(7).setCellValue(exportData.get(dataIndex).getComplianceResultName());
+					dataRow.createCell(8).setCellValue(exportData.get(dataIndex).getOpinion());
+					dataRow.createCell(9).setCellValue(exportData.get(dataIndex).getAccessoryFileName());
+					String feedBackTimeStr = disposeDate(exportData.get(dataIndex).getCreateTime());
+					dataRow.createCell(10).setCellValue(feedBackTimeStr);
+				}
+			}
+
+
+			File fileTemp = new File(path);
+			if (fileTemp.exists()) {
+				fileTemp.delete();
+			}
+			fileTemp.mkdirs();
+			//excel
+			OutputStream excelOS = new FileOutputStream(path + File.separator + fileName);
+			workbook.write(excelOS);
+			excelOS.flush();
+
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+			for (LawsTechnologyEvaluationItemResultEO data : exportData) {
+				String accessoryFile = data.getAccessoryFile();
+
+				List<OSSFile> fileInfosList = iOSSFileService.getFileInfos(accessoryFile);
+				if (fileInfosList.size() != 0) {
+					for (OSSFile ossFile : fileInfosList) {
+						String url = ossFile.getUrl();
+						//判断文件是否存在
+						if(StringUtils.isNotBlank(url)){
+							//判断文件是否存在
+							boolean b = CosBootUtil.doesObjectExist(url);
+							if(b){
+								InputStream download = CosBootUtil.download(url);
+								if(url.endsWith(".pdf") || url.endsWith(".PDF")){
+									String currentTime = sdf.format(new Date());
+									String waterContent = loginUser.getUsername() + " " + currentTime;
+									File newFile = PDFUtils.PDFWatermark(download,uploadpath,ossFile.getFileName(),waterContent);
+									download = new FileInputStream(newFile.getPath());
+								}
+								copyFile(download, path + File.separator + ossFile.getFileName());
+							}
+						}
+					}
+				}
+			}
+			ZipUtil.zip(path, path + ".zip");
+			//文件
+			FileInputStream fis = new FileInputStream(path + ".zip");
+			os = response.getOutputStream();
+
+			int len = 0;
+			while ((len = fis.read()) != -1) {
+				os.write(len);
+			}
+			os.flush();
+			fis.close();
+			excelOS.close();
+
+		}catch (IOException ex){
+			if(CutEnum.CN.getValue().equals(cut)){
+				throw new JeroBootException("下载文件失败");
+			}else{
+				throw new JeroBootException("Failed to download file");
+			}
+		}finally {
+			IOUtils.closeQuietly(os);
+			File file = new File(path);
+			FileUtil.deleteContents(file);
+			File fileTemp = new File(path + ".zip");
+			FileUtil.deleteContents(fileTemp);
+		}
+	}
+
+	public static void copyFile(InputStream in, String newFile) throws IOException {
+		File file2 = new File(newFile);
+		if (!file2.exists()) {
+			file2.createNewFile();
+		}
+		try (FileOutputStream ou = new FileOutputStream(newFile);) {
+			byte[] bs = new byte[1024];
+			int count = 0;
+			while ((count = in.read(bs, 0, bs.length)) != -1) {
+				ou.write(bs, 0, count);
+			}
+			ou.flush();
+		} catch (IOException e) {
+			e.printStackTrace();
+			throw new IOException("复制文件失败！");
+		} finally {
+			in.close();
+		}
+	}
+
+	public String disposeDate(Date date){
+		String result = "";
+		try {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			if(date != null){
+				result = sdf.format(date);
+			}
+		}catch (Exception ex){
+			ex.printStackTrace();
+			log.error("处理日期失败：" +ex.getMessage());
+		}
+		return result;
+	}
+
 	private String getTreeName(String cut, List<SysCategory> categoryList, List<String> evaluationMethodsList) {
 		StringBuilder sb = new StringBuilder();
 		for (String evaluationMethods : evaluationMethodsList) {

From 44d80720aebc943a32fb387b962bef40cbf7c765 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 14 Jul 2022 14:39:32 +0800
Subject: [PATCH 084/103] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/tableCollection/index.vue         | 1 +
 .../components/ParameterItemCollectionList.vue            | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 2b1172fe2..a06568ae1 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -637,6 +637,7 @@
         console.log(pagination, filters, sorter, 'iiiiiiiiiiiiiiiii')
       },
       getTableListReset() {
+        this.formInline = {}
         let params = {
           paramsManifestId: this.$route.query.id,
           pageNo: this.pageNo,
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 39e5754e7..50832f377 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -608,6 +608,8 @@
     },
     mounted() {
       this.GetgetLoginUserType()
+      console.log(this.currentPersonRole)
+      // this.LoginUserType()
       setTimeout(() => {
         if (this.currentPersonRole == 'dre') {
           this.handlePreservation()
@@ -1183,6 +1185,7 @@
           let itemIn = Object.keys(selectedRowKeysValue[i])
           for (let j = 0; j < itemIn.length; j++) {
             if (itemIn[j] !== 'sdt') {
+              console.log(selectedRowKeysValue[i][itemIn[j]])
               if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
                 postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
                 for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
@@ -1436,9 +1439,10 @@
         this.$refs.CollectionTabel.getTableList()
       },
       searchReset() {
+        this.formInline = {}
         this.$refs.CollectionTabel.getTableListReset()
-        this.$refs.globalAdvancedQueryRef.resetLine()
-        this.$refs.globalAdvancedQueryRef.emitCallback()
+        this.$refs.globalAdvancedQueryRef.handleReset()
+        // this.$refs.globalAdvancedQueryRef.emitCallback()
       },
       // 批量删除 -- 与下发收集一致
       handleDelJurisdiction() {

From 63f3cdb8a03f17106ecba88c8465f8e944e1cefc Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 14 Jul 2022 15:13:17 +0800
Subject: [PATCH 085/103] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug55799?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index a06568ae1..34ab134c9 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -46,15 +46,15 @@
 <!--           认证工程师  -->
            <span
              v-if='record.state == "待发起收集" || record.state == "工程接口人退回"'>
-             <span
+             <span :title='record.dataValue'
                @click='ondataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined')? '--': record.dataValue }}</span>
            </span>
              <span v-else>
-             <span @click='dataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined')? '--': record.dataValue }}</span>
+             <span :title='record.dataValue' @click='dataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined')? '--': record.dataValue }}</span>
            </span>
            </span>
            <span v-else>
-             <span @click='dataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined')? '--': record.dataValue }}</span>
+             <span :title='record.dataValue' @click='dataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined')? '--': record.dataValue }}</span>
            </span>
          </span>
 
@@ -438,7 +438,7 @@
                 if (res.data.success) {
                   _this.$message.success(_this.$t('OperationSuccessful'))
                   _this.areaVisiblezr = false
-                  this.getTableList()
+                  this.getLoginUserType()
                 } else {
                   _this.$message.warning(_this.$t('operationFailed'))
                 }

From ace70bd93b08c4b5909b6ca3444515ed8985a1b5 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 14 Jul 2022 15:14:53 +0800
Subject: [PATCH 086/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E5=AF=BC=E5=87=BA=E5=8F=8D=E9=A6=88?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=8E=8B=E7=BC=A9=E5=8C=85=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E3=80=82=20=E6=8F=90=E5=8F=96=E5=A4=8D=E5=88=B6=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=B7=A5=E5=85=B7=E7=B1=BB=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/common/util/FileUtils.java  |  34 +++
 ...valuationComplianceResultEOController.java |  16 ++
 ...echnologyEvaluationComplianceResultEO.java |   4 +
 .../LawsTechnologyEvaluationResultEO.java     |   3 +
 ...gyEvaluationComplianceResultEOService.java |   7 +
 ...wsTechnologyEvaluationResultEOService.java |   2 +
 ...aluationComplianceResultEOServiceImpl.java | 202 ++++++++++++++++++
 ...logyEvaluationItemResultEOServiceImpl.java |  23 +-
 ...chnologyEvaluationResultEOServiceImpl.java |  19 ++
 9 files changed, 289 insertions(+), 21 deletions(-)
 create mode 100644 jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/FileUtils.java

diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/FileUtils.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/FileUtils.java
new file mode 100644
index 000000000..749f1f6d0
--- /dev/null
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/FileUtils.java
@@ -0,0 +1,34 @@
+package com.jero.common.util;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class FileUtils {
+    /**
+     * 复制文件
+     * @param in
+     * @param newFile
+     * @throws IOException
+     */
+    public static void copyFile(InputStream in, String newFile) throws IOException {
+        File file2 = new File(newFile);
+        if (!file2.exists()) {
+            file2.createNewFile();
+        }
+        try (FileOutputStream ou = new FileOutputStream(newFile);) {
+            byte[] bs = new byte[1024];
+            int count = 0;
+            while ((count = in.read(bs, 0, bs.length)) != -1) {
+                ou.write(bs, 0, count);
+            }
+            ou.flush();
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new IOException("复制文件失败！");
+        } finally {
+            in.close();
+        }
+    }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationComplianceResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationComplianceResultEOController.java
index 4d2b69ace..391cad286 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationComplianceResultEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationComplianceResultEOController.java
@@ -2,11 +2,13 @@ package com.jero.modules.lawsTechnologyEvaluation.controller;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import com.jero.common.api.vo.Result;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO;
 import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationComplianceResultEOService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -157,6 +159,20 @@ public class LawsTechnologyEvaluationComplianceResultEOController extends JeroCo
         return super.exportXls(request, lawsTechnologyEvaluationComplianceResultEO, LawsTechnologyEvaluationComplianceResultEO.class, "法规技术评估-评估人反馈-符合性结果表");
     }
 
+	 /**
+	  * 导出zip压缩包，带文件。
+	  * @param response
+	  * @param request
+	  * @param lawsTechnologyEvaluationComplianceResultEO
+	  * @param params
+	  */
+	 @RequestMapping(value = "/exportZip")
+	 public void exportZip(HttpServletResponse response,HttpServletRequest request,
+						   LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO,
+						   @RequestParam Map<String,Object> params) {
+		 this.lawsTechnologyEvaluationComplianceResultEOService.exportZip(response,request, lawsTechnologyEvaluationComplianceResultEO,params);
+	 }
+
     /**
       * 通过excel导入数据
     *
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationComplianceResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationComplianceResultEO.java
index 870313dd1..2b3e8c3ad 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationComplianceResultEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationComplianceResultEO.java
@@ -34,6 +34,8 @@ public class LawsTechnologyEvaluationComplianceResultEO implements Serializable
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
+	@TableField(exist = false)
+    private java.lang.String ids;
 
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
@@ -68,6 +70,8 @@ public class LawsTechnologyEvaluationComplianceResultEO implements Serializable
 	@Excel(name = "符合性结果", width = 15)
     @ApiModelProperty(value = "符合性结果")
     private java.lang.String complianceResult;
+	@TableField(exist = false)
+    private java.lang.String complianceResultName;
 
 	/**流程实例id*/
 	@Excel(name = "流程实例id", width = 15)
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java
index 36f1b37b9..af4611933 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationResultEO.java
@@ -2,6 +2,7 @@ package com.jero.modules.lawsTechnologyEvaluation.entity;
 
 import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -80,6 +81,8 @@ public class LawsTechnologyEvaluationResultEO implements Serializable {
 	@Excel(name = "附件", width = 15)
     @ApiModelProperty(value = "附件")
     private java.lang.String accessoryFile;
+	@TableField(exist = false)
+    private java.lang.String accessoryFileName;
 
 	/**提出时间*/
 	@Excel(name = "提出时间", width = 15, format = "yyyy-MM-dd")
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationComplianceResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationComplianceResultEOService.java
index 335fc9905..6d3895958 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationComplianceResultEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationComplianceResultEOService.java
@@ -2,9 +2,12 @@ package com.jero.modules.lawsTechnologyEvaluation.service;
 
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 法规技术评估-评估人反馈-符合性结果表
@@ -62,4 +65,8 @@ public interface ILawsTechnologyEvaluationComplianceResultEOService extends ISer
     List<LawsTechnologyEvaluationComplianceResultEO> queryList(LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO,
 															   HttpServletRequest req,
 															   String cut);
+
+	void exportZip(HttpServletResponse response, HttpServletRequest request,
+				   LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO,
+				   Map<String, Object> params);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java
index 72ccf5561..d7d1d0f89 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationResultEOService.java
@@ -76,4 +76,6 @@ public interface ILawsTechnologyEvaluationResultEOService extends IService<LawsT
 	 * @return
 	 */
     JSONObject queryEvaluationResultAndComplianceResult(LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO, HttpServletRequest req);
+
+    void disposeData(List<LawsTechnologyEvaluationResultEO> datas, String cut);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java
index c95b3d3b2..5040fe749 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java
@@ -1,18 +1,41 @@
 package com.jero.modules.lawsTechnologyEvaluation.service.impl;
 
+import cn.hutool.core.util.ZipUtil;
 import com.alibaba.druid.util.StringUtils;
+import com.aliyuncs.utils.IOUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.system.vo.LoginUser;
+import com.jero.common.util.FileUtils;
+import com.jero.common.util.oss.CosBootUtil;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationItemResultEO;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO;
+import com.jero.modules.lawsTechnologyEvaluation.enums.ComplianceResultEnum;
 import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationComplianceResultEOMapper;
 import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationComplianceResultEOService;
 import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationResultEOService;
+import com.jero.modules.oss.entity.OSSFile;
+import com.jero.modules.oss.service.IOSSFileService;
+import com.jero.modules.system.util.PDFUtils;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.shiro.SecurityUtils;
+import org.aspectj.util.FileUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+
+import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Date;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -20,6 +43,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * @Description: 法规技术评估-评估人反馈-符合性结果表
@@ -30,8 +54,12 @@ import javax.servlet.http.HttpServletRequest;
 @Service
 @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
 public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends ServiceImpl<LawsTechnologyEvaluationComplianceResultEOMapper, LawsTechnologyEvaluationComplianceResultEO> implements ILawsTechnologyEvaluationComplianceResultEOService {
+	@Value(value = "${jero.path.upload}")
+	private String uploadpath;
 	@Autowired
 	private ILawsTechnologyEvaluationResultEOService evaluationResultEOService;
+	@Autowired
+	private IOSSFileService iOSSFileService;
 
 	/**
 	 * 保存
@@ -103,6 +131,9 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
 																	  HttpServletRequest req,
 																	  String cut) {
 		QueryWrapper<LawsTechnologyEvaluationComplianceResultEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationComplianceResultEO, req.getParameterMap());
+		if(org.apache.commons.lang3.StringUtils.isNotEmpty(lawsTechnologyEvaluationComplianceResultEO.getIds())){
+			queryWrapper.lambda().in(LawsTechnologyEvaluationComplianceResultEO::getId,lawsTechnologyEvaluationComplianceResultEO.getIds().split(","));
+		}
 		List<LawsTechnologyEvaluationComplianceResultEO> complianceResultEOList = this.baseMapper.selectList(queryWrapper);
 
 		if(CollectionUtils.isNotEmpty(complianceResultEOList)){
@@ -111,6 +142,7 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
 			QueryWrapper<LawsTechnologyEvaluationResultEO> evaluationResultEOQueryWrapper = new QueryWrapper<>();
 			evaluationResultEOQueryWrapper.lambda().in(LawsTechnologyEvaluationResultEO::getComplianceResultId,complianceResultIdList);
 			List<LawsTechnologyEvaluationResultEO> evaluationResultEOList = this.evaluationResultEOService.list(evaluationResultEOQueryWrapper);
+			this.evaluationResultEOService.disposeData(evaluationResultEOList,cut);
 
 			if(CollectionUtils.isNotEmpty(evaluationResultEOList)){
 				for (LawsTechnologyEvaluationComplianceResultEO complianceResultEO : complianceResultEOList) {
@@ -129,4 +161,174 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
 		}
 		return complianceResultEOList;
     }
+
+
+	@Override
+	public void exportZip(HttpServletResponse response, HttpServletRequest request,
+						  LawsTechnologyEvaluationComplianceResultEO lawsTechnologyEvaluationComplianceResultEO,
+						  Map<String, Object> params) {
+		String ids = (String)params.get("ids");
+		String cut = (String)params.get("cut");
+
+		if(!StringUtils.isEmpty(ids)){
+			lawsTechnologyEvaluationComplianceResultEO.setIds(ids);
+		}
+		List<LawsTechnologyEvaluationComplianceResultEO> exportData = this.queryList(lawsTechnologyEvaluationComplianceResultEO, request, cut);
+		this.disposeData(exportData,cut);
+
+		String title = "";
+		String bottomTitle = "";
+		String fileName = "";
+		if(org.apache.commons.lang3.StringUtils.equals(cut, CutEnum.CN.getValue())){
+			title = "相关章节,问题说明,附件";
+			bottomTitle = "符合性结果：";
+			fileName = "评估结果 " + ".xlsx";
+		}else if(org.apache.commons.lang3.StringUtils.equals(cut,CutEnum.EN.getValue())){
+			title = "Related section,Problem description,Accessory";
+			bottomTitle = "Compliance results:";
+			fileName = "Evaluation results " + ".xlsx";
+		}
+
+		OutputStream os = null;
+		HSSFWorkbook workbook = new HSSFWorkbook();
+
+		String path = uploadpath + "/tempZip/itemEvaluationResults/" + System.currentTimeMillis();
+
+		try {
+			response.setHeader("Content-Disposition",
+					"attachment; filename=" + fileName);
+			response.setContentType("application/force-download");
+
+			//设置导出数据
+			if(CollectionUtils.isNotEmpty(exportData)) {
+				int size = exportData.size();
+				for (int i = 0; i < exportData.size(); i++){
+					//使用评估人的名字命名sheet页
+					HSSFSheet sheet = workbook.createSheet(exportData.get(i).getCreateBy());
+
+					CellStyle titleCellStyle = workbook.createCellStyle();
+					titleCellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中
+					titleCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//水平居中
+					titleCellStyle.setWrapText(true);//自动换行
+
+					Row firstRow = sheet.createRow(0);
+
+					//创建表头
+					String[] titleArr = title.split(",");
+					for (int j=0; j<=3; j++){
+						sheet.setColumnWidth(j,4000);
+						Cell cell = firstRow.createCell(j);
+						cell.setCellStyle(titleCellStyle);
+						cell.setCellValue(titleArr[j]);
+					}
+
+					//获取这个评估人填写的评估结果
+					List<LawsTechnologyEvaluationResultEO> lawsTechnologyEvaluationResultEOList = exportData.get(i).getLawsTechnologyEvaluationResultEOList();
+					int evaluationResultListSize = lawsTechnologyEvaluationResultEOList.size();
+					if(CollectionUtils.isNotEmpty(lawsTechnologyEvaluationResultEOList)){
+						for (int dataIndex = 0; dataIndex < lawsTechnologyEvaluationResultEOList.size(); dataIndex++) {
+							Row dataRow = sheet.createRow(dataIndex + 1);
+							dataRow.createCell(0).setCellValue(lawsTechnologyEvaluationResultEOList.get(dataIndex).getRelatedSection());
+							dataRow.createCell(1).setCellValue(lawsTechnologyEvaluationResultEOList.get(dataIndex).getIssueOrSuggest());
+							dataRow.createCell(2).setCellValue(lawsTechnologyEvaluationResultEOList.get(dataIndex).getAccessoryFileName());
+						}
+					}
+
+					//把符合性结果设置进excel表格中。
+					Row bottomRow = sheet.createRow(evaluationResultListSize + 1);
+					Cell bottomRowFirstCell = bottomRow.getCell(0);
+					bottomRowFirstCell.setCellStyle(titleCellStyle);
+					bottomRowFirstCell.setCellValue(bottomTitle);
+
+					Cell bottomRowSecondCell = bottomRow.getCell(1);
+					bottomRowSecondCell.setCellValue(exportData.get(i).getComplianceResultName());
+				}
+
+
+			}
+
+
+			File fileTemp = new File(path);
+			if (fileTemp.exists()) {
+				fileTemp.delete();
+			}
+			fileTemp.mkdirs();
+			//excel
+			OutputStream excelOS = new FileOutputStream(path + File.separator + fileName);
+			workbook.write(excelOS);
+			excelOS.flush();
+
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+			for (LawsTechnologyEvaluationComplianceResultEO data : exportData) {
+				List<LawsTechnologyEvaluationResultEO> evaluationResultEOList = data.getLawsTechnologyEvaluationResultEOList();
+				if(CollectionUtils.isNotEmpty(evaluationResultEOList)){
+					for (LawsTechnologyEvaluationResultEO lawsTechnologyEvaluationResultEO : evaluationResultEOList) {
+						String accessoryFile = lawsTechnologyEvaluationResultEO.getAccessoryFile();
+
+						List<OSSFile> fileInfosList = iOSSFileService.getFileInfos(accessoryFile);
+						if (fileInfosList.size() != 0) {
+							for (OSSFile ossFile : fileInfosList) {
+								String url = ossFile.getUrl();
+								//判断文件是否存在
+								if(org.apache.commons.lang3.StringUtils.isNotBlank(url)){
+									//判断文件是否存在
+									boolean b = CosBootUtil.doesObjectExist(url);
+									if(b){
+										InputStream download = CosBootUtil.download(url);
+										if(url.endsWith(".pdf") || url.endsWith(".PDF")){
+											String currentTime = sdf.format(new Date());
+											String waterContent = loginUser.getUsername() + " " + currentTime;
+											File newFile = PDFUtils.PDFWatermark(download,uploadpath,ossFile.getFileName(),waterContent);
+											download = new FileInputStream(newFile.getPath());
+										}
+										//复制文件
+										FileUtils.copyFile(download, path + File.separator + ossFile.getFileName());
+									}
+								}
+							}
+						}
+					}
+				}
+
+			}
+			ZipUtil.zip(path, path + ".zip");
+			//文件
+			FileInputStream fis = new FileInputStream(path + ".zip");
+			os = response.getOutputStream();
+
+			int len = 0;
+			while ((len = fis.read()) != -1) {
+				os.write(len);
+			}
+			os.flush();
+			fis.close();
+			excelOS.close();
+
+		}catch (IOException ex){
+			if(CutEnum.CN.getValue().equals(cut)){
+				throw new JeroBootException("下载文件失败");
+			}else{
+				throw new JeroBootException("Failed to download file");
+			}
+		}finally {
+			IOUtils.closeQuietly(os);
+			File file = new File(path);
+			FileUtil.deleteContents(file);
+			File fileTemp = new File(path + ".zip");
+			FileUtil.deleteContents(fileTemp);
+		}
+	}
+
+	public void disposeData(List<LawsTechnologyEvaluationComplianceResultEO> datas,String cut){
+		if(CollectionUtils.isNotEmpty(datas)){
+			for (LawsTechnologyEvaluationComplianceResultEO data : datas) {
+				if(!StringUtils.isEmpty(data.getComplianceResult())){
+					data.setComplianceResultName(ComplianceResultEnum.getTextByValue(data.getComplianceResult(),cut));
+				}
+			}
+		}
+
+	}
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java
index cb1314e10..1369b2036 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java
@@ -10,6 +10,7 @@ import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
+import com.jero.common.util.FileUtils;
 import com.jero.common.util.oss.CosBootUtil;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationItemResultEO;
 import com.jero.modules.lawsTechnologyEvaluation.enums.ComplianceResultEnum;
@@ -310,7 +311,7 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl
 									File newFile = PDFUtils.PDFWatermark(download,uploadpath,ossFile.getFileName(),waterContent);
 									download = new FileInputStream(newFile.getPath());
 								}
-								copyFile(download, path + File.separator + ossFile.getFileName());
+								FileUtils.copyFile(download, path + File.separator + ossFile.getFileName());
 							}
 						}
 					}
@@ -344,26 +345,6 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl
 		}
 	}
 
-	public static void copyFile(InputStream in, String newFile) throws IOException {
-		File file2 = new File(newFile);
-		if (!file2.exists()) {
-			file2.createNewFile();
-		}
-		try (FileOutputStream ou = new FileOutputStream(newFile);) {
-			byte[] bs = new byte[1024];
-			int count = 0;
-			while ((count = in.read(bs, 0, bs.length)) != -1) {
-				ou.write(bs, 0, count);
-			}
-			ou.flush();
-		} catch (IOException e) {
-			e.printStackTrace();
-			throw new IOException("复制文件失败！");
-		} finally {
-			in.close();
-		}
-	}
-
 	public String disposeDate(Date date){
 		String result = "";
 		try {
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java
index fa773e1ad..6d35252bd 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationResultEOServiceImpl.java
@@ -9,6 +9,9 @@ import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluation
 import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationResultEOMapper;
 import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationComplianceResultEOService;
 import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationResultEOService;
+import com.jero.modules.oss.entity.OSSFile;
+import com.jero.modules.oss.service.IOSSFileService;
+import me.zhyd.oauth.utils.StringUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -17,6 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Date;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Propagation;
@@ -36,6 +40,8 @@ public class LawsTechnologyEvaluationResultEOServiceImpl extends ServiceImpl<Law
 
 	@Autowired
 	private ILawsTechnologyEvaluationComplianceResultEOService complianceResultEOService;
+	@Autowired
+	private IOSSFileService iOSSFileService;
 
 	/**
 	 * 保存
@@ -168,4 +174,17 @@ public class LawsTechnologyEvaluationResultEOServiceImpl extends ServiceImpl<Law
 		}
 		return result;
 	}
+
+	@Override
+	public void disposeData(List<LawsTechnologyEvaluationResultEO> datas, String cut) {
+		if(CollectionUtils.isNotEmpty(datas)){
+			for (LawsTechnologyEvaluationResultEO data : datas) {
+				if(StringUtils.isNotEmpty(data.getAccessoryFile())){
+					List<OSSFile> accessoryFileList = iOSSFileService.getFileInfos(data.getAccessoryFile());
+					String accessoryFileName = accessoryFileList.stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
+					data.setAccessoryFileName(accessoryFileName);
+				}
+			}
+		}
+	}
 }

From d292b1424b9ad834aa7eee0506c471bc93c1a65a Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 14 Jul 2022 15:23:21 +0800
Subject: [PATCH 087/103] =?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

---
 jero-web/src/common/lang/en-us.js             |   2 +
 jero-web/src/common/lang/zh-cn.js             |   2 +
 .../RegulationMonthlyManagement.vue           |  47 ++++-
 .../components/evaluationResultsClause.vue    | 185 +++++++++++++-----
 .../components/evaluationResultsWhole.vue     | 107 +++++-----
 .../technologyAssessment/index.vue            |  29 ++-
 6 files changed, 267 insertions(+), 105 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 5a4951f95..05b8babf8 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1136,4 +1136,6 @@ module.exports = {
   sponsorFeedback:'Sponsor feedback',
   processNumber:'Process number',
   processName:'Process Name',
+  feedbackResults:'Feedback results',
+  theDoesNotSupportPreview:'The current file format does not support Preview',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 37bc3ed86..c2d881205 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1140,4 +1140,6 @@ module.exports = {
   sponsorFeedback:'发起人反馈',
   processNumber:'流程编号',
   processName:'流程名称',
+  feedbackResults:'反馈结果',
+  theDoesNotSupportPreview:'当前文件格式不支持预览',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
index e92a7a565..171c1e423 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
@@ -26,10 +26,10 @@
         <a-icon type="cloud-upload"/>
         {{$t('uploadMonthly')}}
       </div>
-      <div @click="BatchDeleteClick" class="operator-text">
-        <a-icon type="delete"/>
-        {{$t('BatchDelete')}}
-      </div>
+      <!--      <div @click="BatchDeleteClick" class="operator-text">-->
+      <!--        <a-icon type="delete"/>-->
+      <!--        {{$t('BatchDelete')}}-->
+      <!--      </div>-->
     </div>
     <div>
       <a-table
@@ -46,13 +46,21 @@
           <span slot="language" slot-scope="text,record">
                 <span>{{text == 1?$t('chinese'):$t('English')}}</span>
           </span>
+        <span slot="RegulationMonthlyName" slot-scope="text,record">
+             <a @click="preview(record)">{{text}}</a>
+          </span>
         <span slot="operation" slot-scope="text,record">
            <a class="text-operation"
+              v-if="record.createBy == userData.username"
               @click="withdraw(record)">
              {{record.issueStatus == 2 ? $t('release') : $t('withdraw')}}
            </a>
            <a class="text-operation"
+              v-if="record.createBy == userData.username && record.issueStatus == 2"
               @click="deleteLib(record)">{{$t('deleteLib')}}</a>
+           <a class="text-operation"
+              v-if="record.createBy == userData.username || record.issueStatus == 1"
+              @click="download(record)">{{$t('download')}}</a>
         </span>
       </a-table>
       <div class="page" v-if="dataSource && dataSource.length > 0">
@@ -75,7 +83,9 @@
 <script>
   import eventBUs from '../../../../common/event'
   import managementAdd from './modules/managementAdd'
-  import { getAction, postAction } from '@/api/manage'
+  import { getAction, postAction, downloadFile } from '@/api/manage'
+  import { mapGetters } from 'vuex'
+  import { Base64 } from 'js-base64'
 
   export default {
     name: 'RegulationMonthlyManagement',
@@ -97,13 +107,16 @@
         pageSize: 10,
         pageNo: 1,
         queryParam: {},
+        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        userData: {},
         columns: [
           {
             title: this.$t('RegulationMonthlyName'),
             align: 'center',
             dataIndex: 'name',
             width: 190,
-            ellipsis: true
+            ellipsis: true,
+            scopedSlots: { customRender: 'RegulationMonthlyName' }
           },
           {
             title: this.$t('monthlyLanguage'),
@@ -146,8 +159,10 @@
     },
     mounted() {
       this.getList()
+      this.userData = this.userInfo()
     },
     methods: {
+      ...mapGetters(['userInfo']),
       searchQuery() {
         this.pageNo = 1
         this.getList()
@@ -191,6 +206,26 @@
           }
         })
       },
+      preview(item) {
+        let fileName = item.name
+        let index1 = fileName.lastIndexOf('.')
+        let index2 = fileName.length
+        let fileSuffix = fileName.substring(index1, index2)
+        if (fileSuffix === '.pdf') {
+          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + item.fileId + '&userName=' + this.userInfo().username))
+        } else if (fileSuffix === '.docx') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix)
+          window.open(url, '_blank')
+        } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix)
+          window.open(url, '_blank')
+        } else {
+          this.$message.warning(this.$t('theDoesNotSupportPreview'))
+        }
+      },
+      download(item) {
+        downloadFile('/sys/common/downLoadFile', item.name, { id: item.fileId, userName: this.userInfo().username })
+      },
       uploadMonthlyClick() {
         this.$refs.managementAddRef.add()
       },
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue
index 0b5fc24c9..7ddf2723d 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue
@@ -6,7 +6,7 @@
           <!--          <span style="line-height: 66px;display: inline-block;float: left">-->
           <!--            <a-icon type="home" style="margin-right: 6px;"/>-->
           <!--          </span>-->
-          {{$t('regulatoryTechnicalEvaluationResults')}}
+          {{$route.query.serialNumber +' '+$t('regulatoryTechnicalEvaluationResults')}}
         </div>
       </div>
       <div style="padding-top: 68px;background: #fff">
@@ -19,7 +19,7 @@
               </a-button>
             </div>
             <div class="processBackground-text">
-              dskf' ;sdfl';s sd稍等景点风光大家分工法规地方官给，。不买；两个客人坦克；量大幅高开的管理骨科大夫给的快感的法律公开大家赶快来的风格
+              {{$route.query.processBackground}}
             </div>
             <div class="header-text">
               {{$t('engineerFeedbackResults')}}
@@ -35,10 +35,10 @@
                         </div>
                         <PersonnelSelection class="box-input"
                                             :personneQuery="queryParam"
-                                            :query="{db_field_name:'Assessor',db_field_txt:$t('Assessor')}"
+                                            :query="{db_field_name:'evaluators',db_field_txt:$t('Assessor')}"
                                             :isInput="true"
                                             @change="PersonnelSelectionChange"
-                                            v-model="queryParam.AssessorName"/>
+                                            v-model="queryParam.evaluatorsName"/>
                       </div>
                     </a-col>
                     <a-col :md="6" :sm="8">
@@ -46,8 +46,18 @@
                         <div class="title-text" :title="$t('complianceResults')">
                           <span>{{$t('complianceResults')}}</span>
                         </div>
-                        <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('complianceResults')"
-                                 v-model="queryParam.title"></j-input>
+                        <a-select :placeholder="$t('PleaseSelect')+$t('complianceResults')"
+                                  class="box-input"
+                                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                                  v-model="queryParam.complianceResult">
+                          <a-select-option v-for="(item, key) in complianceResultsList"
+                                           :key="key"
+                                           :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title="item.name ">
+                           {{ item.name }}
+                     </span>
+                          </a-select-option>
+                        </a-select>
                       </div>
                     </a-col>
                     <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
@@ -61,7 +71,7 @@
               </div>
               <div class="table-operator">
                 <div @click="fileExportClick" class="operator-text">
-                  <a-icon type="apartment"/>
+                  <a-icon type="export" :rotate="-90"/>
                   {{$t('fileExport')}}
                 </div>
               </div>
@@ -71,142 +81,203 @@
                   size="middle"
                   :loading="loading"
                   :pagination="false"
-                  :scroll="{x: '100%'}"
+                  :scroll="{x: '100%',y:'calc(100vh - 100px)'}"
                   rowKey="id"
                   :data-source="dataSource"
                   :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
                   :columns="columns"
                 >
+                  <div slot="clauseContent" slot-scope="text,result">
+                    <a-tooltip placement="topLeft">
+                      <template slot="title">
+                        <span v-html="text"></span>
+                      </template>
+                      <div class="clauseContent-text" v-html="text"></div>
+                    </a-tooltip>
+                  </div>
+                  <span slot="accessoryFile" slot-scope="text,result">
+                      <a v-if="text" @click="accessoryFileClick(text)">
+                          {{ $t('viewFile') }}
+                       </a>
+                    <span v-else>--</span>
+                     </span>
                 </a-table>
-                <!--                <div class="page" v-if="dataSource && dataSource.length > 0">-->
-                <!--                  <a-pagination-->
-                <!--                    :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
-                <!--                    show-quick-jumper-->
-                <!--                    show-size-changer-->
-                <!--                    :page-size.sync="pageSize"-->
-                <!--                    :total="total"-->
-                <!--                    :current="pageNo"-->
-                <!--                    @change="pageOnChange"-->
-                <!--                    @showSizeChange="SizeChange"-->
-                <!--                  />-->
-                <!--                </div>-->
               </div>
             </a-card>
           </div>
         </div>
       </div>
     </div>
+    <viewFileModel ref="viewFileModelRef"/>
   </div>
 </template>
 
 <script>
   import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import { getAction, postAction, downloadFile } from '@/api/manage'
+  import viewFileModel from '@/components/viewFileModel/index'
+
   export default {
     name: 'evaluationResultsClause',
-    components:{
-      PersonnelSelection
+    components: {
+      PersonnelSelection,
+      viewFileModel
     },
     data() {
       return {
         queryParam: {},
         dataSource: [],
         selectedRowKeys: [],
+        complianceResultsList: [
+          {
+            name: this.$t('accord'),
+            value: 'Compliance'
+          },
+          {
+            name: this.$t('nonConformity'),
+            value: 'Non-Compliance'
+          }
+        ],
         loading: false,
+        url: {
+          list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/list',
+          exportData: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/exportZip'
+        },
         columns: [
           {
             title: this.$t('clauseNo'),
-            dataIndex: 'items_num',
+            dataIndex: 'itemNum',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            width: 160
           },
           {
             title: this.$t('clauseName'),
-            dataIndex: 'items_name',
+            dataIndex: 'itemName',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            width: 160
           },
           {
             title: this.$t('clauseContent'),
-            dataIndex: 'iterms_conditions',
+            dataIndex: 'itemContent',
             align: 'center',
-            ellipsis: true
+            width: 260,
+            scopedSlots: { customRender: 'clauseContent' }
           },
           {
             title: this.$t('Assessor'),
             dataIndex: 'Assessor',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            width: 160
           },
           {
             title: this.$t('evaluationMethod'),
-            dataIndex: 'evaluationMethod',
+            dataIndex: 'evaluationMethodsName',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            width: 160
           },
           {
             title: this.$t('nameTechnicalDocument'),
-            dataIndex: 'nameTechnicalDocument',
+            dataIndex: 'technicalFileName',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            width: 260
           },
           {
             title: this.$t('chapter'),
-            dataIndex: 'chapter',
+            dataIndex: 'section',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            width: 260
           },
           {
             title: this.$t('complianceResults'),
-            dataIndex: 'complianceResults',
+            dataIndex: 'complianceResultName',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            width: 160
           },
           {
             title: this.$t('opinion'),
             dataIndex: 'opinion',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            width: 260
           },
           {
             title: this.$t('enclosure'),
-            dataIndex: 'enclosure',
+            dataIndex: 'accessoryFile',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            width: 160,
+            scopedSlots: { customRender: 'accessoryFile' }
           },
           {
             title: this.$t('feedbackTime'),
-            dataIndex: 'feedbackTime',
+            dataIndex: 'createTime',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            width: 160
           }
         ]
       }
     },
     mounted() {
+      this.getList()
     },
     methods: {
       CurrentStandard() {
 
       },
       onSelectChange(value) {
-
+        this.selectedRowKeys = value
       },
       searchQuery() {
-        this.pageNo = 1
         this.getList()
       },
       searchReset() {
         this.queryParam = {}
-        this.pageNo = 1
         this.getList()
       },
+      getList() {
+        let query = {
+          lawsTechnologyEvaluationId: this.$route.query.id,
+          ...this.queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result || []
+            this.loading = false
+          } else {
+            this.dataSource = []
+            this.loading = false
+          }
+        })
+      },
       fileExportClick() {
-
+        let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+        let query = {
+          ...this.queryParam,
+          ids: selectedRowKeys.join(','),
+          lawsTechnologyEvaluationId: this.$route.query.id
+        }
+        downloadFile(this.url.exportData, this.$route.query.serialNumber + ' ' + this.$t('regulatoryTechnicalEvaluationResults') + '.zip',
+          query, this.Deselect)
+      },
+      Deselect() {
+        this.selectedRowKeys = []
       },
       PersonnelSelectionChange(value, id) {
         this.queryParam[value] = id
         this.queryParam = { ...this.queryParam }
       },
+      accessoryFileClick(item) {
+        this.$refs.viewFileModelRef.clickButtonToUpload(item)
+      }
     }
   }
 </script>
@@ -228,6 +299,7 @@
         display: flex;
         justify-content: space-between;
         border-bottom: 2px #eff1f3 solid;
+        z-index: 1000;
         background: #fff;
 
         .doc-detail-title {
@@ -326,9 +398,30 @@
     margin-top: 2px;
   }
 
+  .clauseContent-text {
+    width: 100%;
+    overflow: hidden;
+    display: -webkit-box;
+    text-overflow: ellipsis;
+    /*! autoprefixer: off */
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    /*! autoprefixer: on;*/
+    text-justify: inter-ideograph;
+    word-break: break-all
+  }
 </style>
 <style>
   .box-clause .ant-card-body {
     padding: 0;
   }
+
+  .box-input .ant-select-selection--single {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+    height: 38px;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
index f645cc16e..cde7e8ce8 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
@@ -6,7 +6,7 @@
           <!--          <span style="line-height: 66px;display: inline-block;float: left">-->
           <!--            <a-icon type="home" style="margin-right: 6px;"/>-->
           <!--          </span>-->
-          {{$t('regulatoryTechnicalEvaluationResults')}}
+          {{$route.query.serialNumber +' '+$t('regulatoryTechnicalEvaluationResults')}}
         </div>
       </div>
       <div style="padding-top: 68px;background: #fff">
@@ -19,18 +19,18 @@
               </a-button>
             </div>
             <div class="processBackground-text">
-              dskf' ;sdfl';s sd稍等景点风光大家分工法规地方官给，。不买；两个客人坦克；量大幅高开的管理骨科大夫给的快感的法律公开大家赶快来的风格
+              {{$route.query.processBackground}}
             </div>
             <!--            <div class="header-text">-->
             <!--              {{$t('engineerFeedbackResults')}}-->
             <!--            </div>-->
-            <a-card :bordered="false" class="box-clause" style="margin-top: 20px" v-for="item in dataSource">
+            <a-card :bordered="false" class="box-clause" style="margin-top: 20px" v-for="(item,index) in dataSource">
               <div class="table-operator">
-                <div @click="fileExportClick" class="operator-text" style="float: left;font-size: 16px">
-                  {{$t('engineerFeedbackResults')}}
+                <div class="operator-text" style="float: left;font-size: 16px">
+                  {{$t('engineer')+item.createBy+$t('feedbackResults')}}
                 </div>
-                <div @click="fileExportClick" class="operator-text">
-                  <a-icon type="apartment"/>
+                <div @click="fileExportClick" v-if="index == 0" class="operator-text">
+                  <a-icon type="export" :rotate="-90"/>
                   {{$t('fileExport')}}
                 </div>
               </div>
@@ -40,77 +40,77 @@
                   size="middle"
                   :loading="loading"
                   :pagination="false"
-                  :scroll="{x: '100%'}"
-                  :data-source="item.dataList"
+                  :scroll="{x: '100%',y:350}"
+                  :data-source="item.lawsTechnologyEvaluationResultEOList"
                   :columns="columns"
                 >
+                   <span slot="accessoryFile" slot-scope="text,result">
+                      <a v-if="text" @click="accessoryFileClick(text)">
+                          {{ $t('viewFile') }}
+                       </a>
+                    <span v-else>--</span>
+                     </span>
                 </a-table>
               </div>
+              <div class="text-results">
+                {{$t('complianceResults')}}：{{item.complianceResultName}}
+              </div>
             </a-card>
           </div>
         </div>
       </div>
     </div>
+    <viewFileModel ref="viewFileModelRef"/>
   </div>
 </template>
 
 <script>
   import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import { getAction, postAction, downloadFile } from '@/api/manage'
+  import viewFileModel from '@/components/viewFileModel/index'
 
   export default {
     name: 'evaluationResultsWhole',
     components: {
-      PersonnelSelection
+      PersonnelSelection,
+      viewFileModel
     },
     data() {
       return {
         queryParam: {},
-        dataSource: [
-          {
-            dataList:[
-              {
-                relevantSections:111,
-                problemDescription:222,
-                enclosure:'',
-              }
-            ]
-          },
-          {
-            dataList:[
-              {
-                relevantSections:111,
-                problemDescription:222,
-                enclosure:'',
-              }
-            ]
-          }
-        ],
+        dataSource: [],
+        url: {
+          list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/list',
+          exportData:'lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/exportZip',
+        },
         selectedRowKeys: [],
         loading: false,
 
         columns: [
           {
             title: this.$t('relevantSections'),
-            dataIndex: 'relevantSections',
+            dataIndex: 'relatedSection',
             align: 'center',
             ellipsis: true
           },
           {
             title: this.$t('problemDescription'),
-            dataIndex: 'problemDescription',
+            dataIndex: 'issueOrSuggest',
             align: 'center',
             ellipsis: true
           },
           {
             title: this.$t('enclosure'),
-            dataIndex: 'enclosure',
+            dataIndex: 'accessoryFile',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            scopedSlots: { customRender: 'accessoryFile' }
           }
         ]
       }
     },
     mounted() {
+      this.getList()
     },
     methods: {
       CurrentStandard() {
@@ -118,22 +118,30 @@
       },
       onSelectChange(value) {
 
-      },
-      searchQuery() {
-        this.pageNo = 1
-        this.getList()
-      },
-      searchReset() {
-        this.queryParam = {}
-        this.pageNo = 1
-        this.getList()
       },
       fileExportClick() {
-
+        let query = {
+          lawsTechnologyEvaluationId: this.$route.query.id
+        }
+        downloadFile(this.url.exportData, this.$route.query.serialNumber + ' ' + this.$t('regulatoryTechnicalEvaluationResults') + '.zip', query)
       },
-      PersonnelSelectionChange(value, id) {
-        this.queryParam[value] = id
-        this.queryParam = { ...this.queryParam }
+      getList() {
+        let query = {
+          lawsTechnologyEvaluationId: this.$route.query.id
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result || []
+            this.loading = false
+          } else {
+            this.dataSource = []
+            this.loading = false
+          }
+        })
+      },
+      accessoryFileClick(item) {
+        this.$refs.viewFileModelRef.clickButtonToUpload(item)
       }
     }
   }
@@ -150,6 +158,7 @@
       .doc-detail-header {
         width: 100%;
         height: 68px;
+        z-index: 1000;
         line-height: 68px;
         padding: 0 0 0 32px;
         box-sizing: border-box;
@@ -254,6 +263,10 @@
     margin-top: 2px;
   }
 
+  .text-results {
+    font-size: 14px;
+    margin-top: 10px;
+  }
 </style>
 <style>
   .box-clause .ant-card-body {
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
index 52e936410..a91cd38f5 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
@@ -156,9 +156,10 @@
 <script>
   import { getAction, postAction } from '@/api/manage'
   import processInformation from './components/processInformation'
+
   export default {
     name: 'index',
-    components:{
+    components: {
       processInformation
     },
     data() {
@@ -360,11 +361,27 @@
         this.$refs.processInformationRef.getData(JSON.parse(JSON.stringify(row)))
       },
       evaluationResultsClick(row) {
-        let newUrl = this.$router.resolve({
-          path: '/evaluationResultsWhole',
-          query: row
-        })
-        window.open(newUrl.href, '_blank')
+        if (row.evaluationType == 'Feedback evaluation') {
+          let newUrl = this.$router.resolve({
+            path: '/evaluationResultsWhole',
+            query: {
+              id:row.id,
+              processBackground:row.processBackground,
+              serialNumber:row.serialNumber
+            }
+          })
+          window.open(newUrl.href, '_blank')
+        } else {
+          let newUrl = this.$router.resolve({
+            path: '/evaluationResultsClause',
+            query: {
+              id:row.id,
+              processBackground:row.processBackground,
+              serialNumber:row.serialNumber
+            }
+          })
+          window.open(newUrl.href, '_blank')
+        }
       }
     }
   }

From 87cab0fa11280d603dd7c2dff3d5c49c61204b09 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 14 Jul 2022 15:56:43 +0800
Subject: [PATCH 088/103] =?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/evaluationResultsList.vue      |  1 +
 .../RegulationMonthlyManagement.vue           |  6 +-
 .../components/monthlyReportRegulations.vue   | 97 +++++++++++++------
 .../components/feedbackInformation.vue        |  7 ++
 .../processForm/regulatoryProcess/index.vue   | 16 +--
 5 files changed, 91 insertions(+), 36 deletions(-)

diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
index 61b515122..60fa6094d 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
@@ -92,6 +92,7 @@
             title: this.$t('relevantSections'),
             align: 'center',
             dataIndex: 'relatedSection',
+            ellipsis: true,
             width: 180
           },
           {
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
index 171c1e423..b10d4c466 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
@@ -220,7 +220,11 @@
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix)
           window.open(url, '_blank')
         } else {
-          this.$message.warning(this.$t('theDoesNotSupportPreview'))
+          if (item.createBy == this.userInfo().username){
+            downloadFile('/sys/common/downLoadFile', item.name, { id: item.fileId, userName: this.userInfo().username })
+          }else{
+            this.$message.warning(this.$t('theDoesNotSupportPreview'))
+          }
         }
       },
       download(item) {
diff --git a/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue b/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue
index 5f005c4e8..b70c93ce8 100644
--- a/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue
+++ b/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue
@@ -2,60 +2,98 @@
   <div class="monthlyReportRegulations-box">
     <div class="header-text">
       <div class="header-text-left">{{this.$t('monthlyReportRegulations')}}</div>
-      <div class="header-text-right">
+      <div class="header-text-right" @click="moreClick">
         More
         <img src="../../../assets/gengduo.png" alt="">
       </div>
     </div>
-    <div class="monthlyReportRegulations-box-content">
-      <div class="monthlyReportRegulations-text" v-for="item in monthlyReportRegulationsList">
+    <div class="monthlyReportRegulations-box-content" v-if="monthlyReportRegulationsList.length > 0">
+      <div class="monthlyReportRegulations-text" v-for="item in monthlyReportRegulationsList" @click="preview(item)">
         <div class="yuan"></div>
         <div class="text" :title="item.name">{{item.name}}</div>
-        <div class="time">{{item.time}}</div>
+        <div class="time">{{item.createTime}}</div>
       </div>
     </div>
+    <div v-else style="height: 300px;position: relative">
+      <JNoData/>
+    </div>
+    <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
   </div>
 </template>
 
 <script>
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+  import { Base64 } from 'js-base64'
+  import { mapGetters } from 'vuex'
+
   export default {
     name: 'monthlyReportRegulations',
     data() {
       return {
-        monthlyReportRegulationsList: [
-          {
-            name: '蔚来汽车法规月报_202201_主页面 CN.docx',
-            time: '2022-01-01 13:24:36'
-          },
-          {
-            name: '蔚来汽车法规月报_202202_主页面 CN.docx',
-            time: '2022-02-01 15:50:06'
-          },
-          {
-            name: '蔚来汽车法规月报_202203_主页面 CN.docx',
-            time: '2022-03-01 13:56:20'
-          },
-          {
-            name: '蔚来汽车法规月报_202204_主页面 CN.docx',
-            time: '2022-04-01 16:24:45'
-          },
-          {
-            name: '蔚来汽车法规月报_202205_主页面 CN.docx',
-            time: '2022-06-01 17:24:06'
-          },
-          {
-            name: '蔚来汽车法规月报_202206_主页面 CN.docx',
-            time: '2022-06-01 17:24:06'
+        monthlyReportRegulationsList: [],
+        loading: false,
+        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        url: {
+          list: '/report/lawsMonthlyReportManageEO/page'
+        }
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      getList() {
+        let query = {
+          pageNo: 1,
+          pageSize: 6,
+          issueStatus: '1'
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.monthlyReportRegulationsList = res.result.records || []
+            this.loading = false
+          } else {
+            this.loading = false
           }
-        ]
+        })
+      },
+      moreClick() {
+        this.$router.push({
+          path: '/monthlyRegulationReport'
+        })
+      },
+      preview(item) {
+        let fileName = item.name
+        let index1 = fileName.lastIndexOf('.')
+        let index2 = fileName.length
+        let fileSuffix = fileName.substring(index1, index2)
+        if (fileSuffix === '.pdf') {
+          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + item.fileId + '&userName=' + this.userInfo().username))
+        } else if (fileSuffix === '.docx') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix)
+          window.open(url, '_blank')
+        } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix)
+          window.open(url, '_blank')
+        } else {
+          if (item.createBy == this.userInfo().username){
+            downloadFile('/sys/common/downLoadFile', item.name, { id: item.fileId, userName: this.userInfo().username })
+          }else{
+            this.$message.warning(this.$t('theDoesNotSupportPreview'))
+          }
+        }
       }
     }
+
   }
 </script>
 
 <style scoped lang="less">
   .monthlyReportRegulations-box {
     width: 100%;
+    position: relative;
 
     .header-text {
       width: 100%;
@@ -73,6 +111,7 @@
         font-weight: 400;
         color: #9B9DA9;
         margin-top: 6px;
+        cursor: pointer;
       }
     }
 
diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue
index 31a6c837d..8c7c98df8 100644
--- a/jero-web/src/views/processCenter/components/feedbackInformation.vue
+++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue
@@ -181,6 +181,13 @@
       deleteData() {
         this.formInline.dataList.pop()
         this.formInline = { ...this.formInline }
+      },
+      submitData(callBack) {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            callBack && callBack(this.formInline.dataList)
+          }
+        })
       }
     }
   }
diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
index 9d30aecbb..29935870b 100644
--- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
@@ -142,13 +142,13 @@
           res.lawsOpinionGatherId = this.queryProject.id
           res.actiProcInstId = this.$route.query.prcId
         })
-        postAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/insertBatch', { dataList:list }).then((res) => {
+        postAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/insertBatch', { dataList: list }).then((res) => {
           if (res.success) {
             if (num == 1) {
               this.$message.success(this.$t('OperationSuccessful'))
-              this.$router.push({
-                path: '/collectionOfRegulatoryOpinions'
-              })
+              // this.$router.push({
+              //   path: '/collectionOfRegulatoryOpinions'
+              // })
               this.loading = false
             } else {
               this.completeTask()
@@ -162,8 +162,12 @@
         })
       },
       submit() {
-        let dataList = this.$refs.feedbackInformationRef.formInline.dataList
-        this.insertBatch(dataList, 2)
+        this.$refs.feedbackInformationRef.submitData((res) => {
+          this.loading = true
+          this.insertBatch(res, 2)
+        })
+        // let dataList = this.$refs.feedbackInformationRef.formInline.dataList
+        // this.insertBatch(dataList, 2)
       },
       completeTask() {
         let query = {

From 9f0a808481d5326e6be3726123b2053450189b77 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 14 Jul 2022 16:34:59 +0800
Subject: [PATCH 089/103] =?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\=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=AF=B9=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   4 +
 jero-web/src/common/lang/zh-cn.js             |   4 +
 .../components/initiatingProcess.vue          |   2 +
 .../documentComparison/index.vue              | 340 ++++++++++++++++++
 4 files changed, 350 insertions(+)
 create mode 100644 jero-web/src/views/documentTools/documentComparison/index.vue

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 05b8babf8..d8636703c 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1138,4 +1138,8 @@ module.exports = {
   processName:'Process Name',
   feedbackResults:'Feedback results',
   theDoesNotSupportPreview:'The current file format does not support Preview',
+  releaseSituation:'Release situation',
+  comparisonResults:'Comparison results',
+  Published:'Published',
+  initiateComparison:'Initiate comparison',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index c2d881205..15bbd4c33 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1142,4 +1142,8 @@ module.exports = {
   processName:'流程名称',
   feedbackResults:'反馈结果',
   theDoesNotSupportPreview:'当前文件格式不支持预览',
+  releaseSituation:'发布情况',
+  comparisonResults:'对比结果',
+  Published:'已发布',
+  initiateComparison:'发起对比',
 }
\ 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 662cbdcf2..e5d051ce9 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -474,12 +474,14 @@
           query = {
             type: 6,
             ...value,
+            firstInitiation:"1",
             msg: JSON.stringify({ itemList: dataList }).replace(/\"/g, '\'')
           }
         } else {
           query = {
             type: 6,
             ...value,
+            firstInitiation:"1",
             msg: JSON.stringify({ evaluators: value.evaluators }).replace(/\"/g, '\'')
           }
         }
diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue
new file mode 100644
index 000000000..034141af2
--- /dev/null
+++ b/jero-web/src/views/documentTools/documentComparison/index.vue
@@ -0,0 +1,340 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standard')">
+                <span>{{$t('standard')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                       v-model="queryParam.serialNumber"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('title')">
+                <span>{{$t('title')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.title"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text tree-select">
+              <div class="title-text" :title="$t('releaseSituation')">
+                <span>{{$t('releaseSituation')}}</span>
+              </div>
+              <a-select :placeholder="$t('PleaseSelect')+$t('releaseSituation')"
+                        class="box-input"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        v-model="queryParam.flowStatus">
+                <a-select-option v-for="(item, key) in gatherResultList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </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-col>
+      </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator">
+      <div @click="initiatingProcessClick" class="operator-text">
+        <a-icon type="apartment"/>
+        {{$t('initiateComparison')}}
+      </div>
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%'}"
+        rowKey="id"
+        :data-source="dataSource"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :columns="columns"
+      >
+        <!--         -->
+        <span slot="operation" slot-scope="text,record">
+           <a class="text-operation" @click="comparisonResultsClick(record)">{{$t('comparisonResults')}}</a>
+           <a class="text-operation"
+              @click="subscribe(record)">
+            {{!record.readFlag || record.readFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}}
+           </a>
+          <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
+          <a class="text-operation" @click="deleteData(record)">{{$t('delete')}}</a>
+        </span>
+      </a-table>
+      <div class="page" v-if="dataSource && dataSource.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="pageOnChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+  </a-card>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+
+  export default {
+    name: 'index',
+    components: {},
+    data() {
+      return {
+        //url传参严格按照当前命名
+        url: {
+          list: '',
+          deleteBatch:'',
+        },
+        loading: false,
+        dataSource: [],
+        selectedRowKeys: [],
+        total: 0,
+        pageSize: 10,
+        pageNo: 1,
+        queryParam: {},
+        gatherResultList: [
+          {
+            value: '1',
+            name: this.$t('draft')
+          },
+          {
+            value: '2',
+            name: this.$t('Published')
+          }
+        ],
+        columns: [
+          {
+            title: this.$t('standard') + 1,
+            align: 'center',
+            dataIndex: 'serialNumber',
+            width: 170
+          },
+          {
+            title: this.$t('title') + 1,
+            align: 'center',
+            dataIndex: 'title',
+            width: 170
+          },
+          {
+            title: this.$t('TextStatus'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'TextStatus'
+          },
+          {
+            title: this.$t('fileName'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'fileName'
+          },
+          {
+            title: this.$t('standard') + 2,
+            align: 'center',
+            dataIndex: 'serialNumberTwo',
+            width: 170
+          },
+          {
+            title: this.$t('title') + 2,
+            align: 'center',
+            dataIndex: 'titleTwo',
+            width: 170
+          },
+          {
+            title: this.$t('TextStatus'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'TextStatusTwo'
+          },
+          {
+            title: this.$t('fileName'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'fileNameTwo'
+          },
+          {
+            title: this.$t('releaseSituation'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'releaseSituation'
+          },
+          {
+            title: this.$t('remarks'),
+            align: 'center',
+            ellipsis: true,
+            width: 170,
+            dataIndex: 'remark'
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 260,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ]
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      searchQuery() {
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+      },
+      comparisonResultsClick() {
+
+      },
+      subscribe() {
+
+      },
+      edit(){
+
+      },
+      initiatingProcessClick(){
+
+      },
+      deleteData(val){
+        let _this = this
+        this.$confirm({
+          content: _this.$t('ConfirmDelete'),
+          onOk() {
+            getAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.getList()
+              } else {
+                _this.$message.warning(res.message)
+              }
+            })
+          }
+        })
+      },
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .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;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+</style>
\ No newline at end of file

From fad922ffba7c1f6ed8e3f324b1de2e9767afe5c7 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 14 Jul 2022 16:58:47 +0800
Subject: [PATCH 090/103] =?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

---
 .../components/ParameterItemCollectionList.vue              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 50832f377..73f000e8c 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -1180,12 +1180,12 @@
             selectedRowKeysValue.push(res)
           }
         })
+        console.log(selectedRowKeysValue)
         for (let i = 0; i < selectedRowKeysValue.length; i++) {
           let postDateobj = {}
           let itemIn = Object.keys(selectedRowKeysValue[i])
           for (let j = 0; j < itemIn.length; j++) {
-            if (itemIn[j] !== 'sdt') {
-              console.log(selectedRowKeysValue[i][itemIn[j]])
+            if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
               if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
                 postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
                 for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
@@ -1244,7 +1244,7 @@
           let postDateobj = {}
           let itemIn = Object.keys(selectedRowKeysValue[i])
           for (let j = 0; j < itemIn.length; j++) {
-            if (itemIn[j] !== 'sdt') {
+            if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
               if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
                 postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
                 for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {

From db50bba7f2e3fcc0920481a7b7624f5e011febb0 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 14 Jul 2022 17:19:52 +0800
Subject: [PATCH 091/103] =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   3 +
 jero-web/src/common/lang/zh-cn.js             |   3 +
 .../documentComparison/index.vue              |   2 +-
 .../documentTranslation/index.vue             | 330 ++++++++++++++++++
 4 files changed, 337 insertions(+), 1 deletion(-)
 create mode 100644 jero-web/src/views/documentTools/documentTranslation/index.vue

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index d8636703c..41480baf8 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1142,4 +1142,7 @@ module.exports = {
   comparisonResults:'Comparison results',
   Published:'Published',
   initiateComparison:'Initiate comparison',
+  translationLanguage:'Translation language',
+  translationResults:'Translation results',
+  conversionTime:'Conversion time',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 15bbd4c33..98f362d10 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1146,4 +1146,7 @@ module.exports = {
   comparisonResults:'对比结果',
   Published:'已发布',
   initiateComparison:'发起对比',
+  translationLanguage:'翻译语言',
+  translationResults:'翻译结果',
+  conversionTime:'转换时间',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue
index 034141af2..9038af696 100644
--- a/jero-web/src/views/documentTools/documentComparison/index.vue
+++ b/jero-web/src/views/documentTools/documentComparison/index.vue
@@ -73,7 +73,7 @@
            <a class="text-operation" @click="comparisonResultsClick(record)">{{$t('comparisonResults')}}</a>
            <a class="text-operation"
               @click="subscribe(record)">
-            {{!record.readFlag || record.readFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}}
+            {{!record.state || record.state == 0 ? $t('release') :$t('withdraw')}}
            </a>
           <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
           <a class="text-operation" @click="deleteData(record)">{{$t('delete')}}</a>
diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue
new file mode 100644
index 000000000..28593c4e6
--- /dev/null
+++ b/jero-web/src/views/documentTools/documentTranslation/index.vue
@@ -0,0 +1,330 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standard')">
+                <span>{{$t('standard')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                       v-model="queryParam.serialNumber"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('title')">
+                <span>{{$t('title')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.title"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text tree-select">
+              <div class="title-text" :title="$t('releaseSituation')">
+                <span>{{$t('releaseSituation')}}</span>
+              </div>
+              <a-select :placeholder="$t('PleaseSelect')+$t('releaseSituation')"
+                        class="box-input"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        v-model="queryParam.flowStatus">
+                <a-select-option v-for="(item, key) in gatherResultList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </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-col>
+      </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator">
+      <div @click="initiatingProcessClick" class="operator-text">
+        <a-icon type="apartment"/>
+        {{$t('initiateComparison')}}
+      </div>
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%'}"
+        rowKey="id"
+        :data-source="dataSource"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :columns="columns"
+      >
+        <!--         -->
+        <span slot="operation" slot-scope="text,record">
+          <a class="text-operation" @click="viewClick(record)">{{$t('view')}}</a>
+          <a class="text-operation" @click="checkClick(record)">{{$t('check')}}</a>
+                     <a class="text-operation"
+                        @click="subscribe(record)">
+            {{!record.state || record.state == 0 ? $t('release') :$t('withdraw')}}
+           </a>
+          <a class="text-operation" @click="downloadData(record)">{{$t('download')}}</a>
+          <a class="text-operation" @click="deleteData(record)">{{$t('delete')}}</a>
+        </span>
+      </a-table>
+      <div class="page" v-if="dataSource && dataSource.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="pageOnChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+  </a-card>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+
+  export default {
+    name: 'index',
+    components: {},
+    data() {
+      return {
+        //url传参严格按照当前命名
+        url: {
+          list: '',
+          deleteBatch:'',
+        },
+        loading: false,
+        dataSource: [],
+        selectedRowKeys: [],
+        total: 0,
+        pageSize: 10,
+        pageNo: 1,
+        queryParam: {},
+        gatherResultList: [
+          {
+            value: '1',
+            name: this.$t('draft')
+          },
+          {
+            value: '2',
+            name: this.$t('Published')
+          }
+        ],
+        columns: [
+          {
+            title: this.$t('standard'),
+            align: 'center',
+            dataIndex: 'serialNumber',
+            width: 170
+          },
+          {
+            title: this.$t('title'),
+            align: 'center',
+            dataIndex: 'title',
+            width: 170
+          },
+          {
+            title: this.$t('TextStatus'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'TextStatus'
+          },
+          {
+            title: this.$t('fileName'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'fileName'
+          },
+          {
+            title: this.$t('translationLanguage'),
+            align: 'center',
+            dataIndex: 'translationLanguage',
+            width: 170
+          },
+          {
+            title: this.$t('translationResults'),
+            align: 'center',
+            dataIndex: 'translationResults',
+            width: 170
+          },
+          {
+            title: this.$t('conversionTime'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'conversionTime'
+          },
+          {
+            title: this.$t('releaseSituation'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'releaseSituation'
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 260,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ]
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      searchQuery() {
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+      },
+      viewClick(row) {
+
+      },
+      checkClick(row){
+
+      },
+      downloadData(){
+
+      },
+      subscribe() {
+
+      },
+      initiatingProcessClick(){
+
+      },
+      deleteData(val){
+        let _this = this
+        this.$confirm({
+          content: _this.$t('ConfirmDelete'),
+          onOk() {
+            getAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.getList()
+              } else {
+                _this.$message.warning(res.message)
+              }
+            })
+          }
+        })
+      },
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .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;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+</style>
\ No newline at end of file

From 37ad2c8e3d8b04c8c17347ae281483d6ef1ddcee Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 14 Jul 2022 17:45:04 +0800
Subject: [PATCH 092/103] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=86=E8=8A=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/evaluationResultsClause.vue    | 10 ++-
 .../components/evaluationResultsWhole.vue     | 12 +++-
 .../components/initiatingProcess.vue          | 63 +++++++++++--------
 .../technologyAssessment/index.vue            | 19 ++++--
 4 files changed, 69 insertions(+), 35 deletions(-)

diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue
index 7ddf2723d..0eb59c342 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue
@@ -230,7 +230,15 @@
     },
     methods: {
       CurrentStandard() {
-
+        let query = {
+          firstInitiation: '2',
+          whetherTobring: '1'
+        }
+        let newUrl = this.$router.resolve({
+          path: '/evaluationInitiationProcess',
+          query: query
+        })
+        window.open(newUrl.href, '_blank')
       },
       onSelectChange(value) {
         this.selectedRowKeys = value
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
index cde7e8ce8..8d83206c5 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
@@ -81,7 +81,7 @@
         dataSource: [],
         url: {
           list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/list',
-          exportData:'lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/exportZip',
+          exportData: 'lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/exportZip'
         },
         selectedRowKeys: [],
         loading: false,
@@ -114,7 +114,15 @@
     },
     methods: {
       CurrentStandard() {
-
+        let query = {
+          firstInitiation: '2',
+          whetherTobring: '2'
+        }
+        let newUrl = this.$router.resolve({
+          path: '/evaluationInitiationProcess',
+          query: query
+        })
+        window.open(newUrl.href, '_blank')
       },
       onSelectChange(value) {
 
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
index e5d051ce9..b89247abf 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -5,34 +5,37 @@
     />
     <div class="detail-box">
       <div class="detail-content" style="padding: 20px">
-        <div class="table-page-search-wrapper">
+        <div class="table-page-search-wrapper" v-if="whetherDisplay">
           <search ref="searchRef"
                   :flag="'1'"
                   :url="url"/>
         </div>
-        <a-table
-          ref="table"
-          size="middle"
-          :loading="loading"
-          :pagination="false"
-          :scroll="{x: '100%'}"
-          rowKey="id"
-          :data-source="dataSource"
-          :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange ,columnTitle:' '}"
-          :columns="columns"
-        >
-        </a-table>
-        <div class="page" v-if="dataSource && dataSource.length > 0">
-          <a-pagination
-            :show-total="total => $t('total')+` ${total} `+$t('strip')"
-            show-quick-jumper
-            :page-size.sync="pageSize"
-            :total="total"
-            :current="pageNo"
-            @change="pageOnChange"
-            @showSizeChange="SizeChange"
-          />
+        <div v-if="whetherDisplay">
+          <a-table
+            ref="table"
+            size="middle"
+            :loading="loading"
+            :pagination="false"
+            :scroll="{x: '100%'}"
+            rowKey="id"
+            :data-source="dataSource"
+            :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange ,columnTitle:' '}"
+            :columns="columns"
+          >
+          </a-table>
+          <div class="page" v-if="dataSource && dataSource.length > 0">
+            <a-pagination
+              :show-total="total => $t('total')+` ${total} `+$t('strip')"
+              show-quick-jumper
+              :page-size.sync="pageSize"
+              :total="total"
+              :current="pageNo"
+              @change="pageOnChange"
+              @showSizeChange="SizeChange"
+            />
+          </div>
         </div>
+
         <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
           <a-row :gutter="24" style="margin-bottom: 10px">
             <a-col :span="24">
@@ -238,6 +241,7 @@
         },
         searchParmes: {},
         selectedRowKeysRecord: [],
+        whetherDisplay: false,
         columns: [
           {
             title: this.$t('standard'),
@@ -293,6 +297,11 @@
       } else {
         this.isTrue = false
       }
+      if (this.$route.query.firstInitiation == '1') {
+        this.whetherDisplay = true
+      } else {
+        this.whetherDisplay = false
+      }
       eventBUs.$on('searchQuery', search => {
         Object.keys(search).forEach(res => {
           if (search[res] instanceof Array) {
@@ -454,7 +463,9 @@
         value.startTime = startTime
         value.flowStatus = 'Underway'
         value.taskAffirmDueDate = value.endTime
-        value.lawsTechnologyEvaluationId = this.getUUID()
+        if (!value.lawsTechnologyEvaluationId){
+          value.lawsTechnologyEvaluationId = this.getUUID()
+        }
         value.regulationOwnerId = this.userInfo().id
         value.regulationOwnerName = this.userInfo().username
         Object.keys(value).forEach(res => {
@@ -474,14 +485,14 @@
           query = {
             type: 6,
             ...value,
-            firstInitiation:"1",
+            firstInitiation: this.$route.query.firstInitiation,
             msg: JSON.stringify({ itemList: dataList }).replace(/\"/g, '\'')
           }
         } else {
           query = {
             type: 6,
             ...value,
-            firstInitiation:"1",
+            firstInitiation: this.$route.query.firstInitiation,
             msg: JSON.stringify({ evaluators: value.evaluators }).replace(/\"/g, '\'')
           }
         }
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
index a91cd38f5..f0d7db090 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
@@ -339,6 +339,7 @@
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
             this.visible = false
+            this.formInline.firstInitiation = '1'
             let newUrl = this.$router.resolve({
               path: '/evaluationInitiationProcess',
               query: this.formInline
@@ -365,9 +366,12 @@
           let newUrl = this.$router.resolve({
             path: '/evaluationResultsWhole',
             query: {
-              id:row.id,
-              processBackground:row.processBackground,
-              serialNumber:row.serialNumber
+              id: row.id,
+              processBackground: row.processBackground,
+              serialNumber: row.serialNumber,
+              title: row.title,
+              technologyTerritory: row.technologyTerritory,
+              standId: row.standId
             }
           })
           window.open(newUrl.href, '_blank')
@@ -375,9 +379,12 @@
           let newUrl = this.$router.resolve({
             path: '/evaluationResultsClause',
             query: {
-              id:row.id,
-              processBackground:row.processBackground,
-              serialNumber:row.serialNumber
+              id: row.id,
+              processBackground: row.processBackground,
+              serialNumber: row.serialNumber,
+              title: row.title,
+              technologyTerritory: row.technologyTerritory,
+              standId: row.standId
             }
           })
           window.open(newUrl.href, '_blank')

From 933335d491b4319f14e8c1aaaaa433871129dd54 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 14 Jul 2022 18:13:48 +0800
Subject: [PATCH 093/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=8E=A5=E5=8F=A3=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsProcessHistoryEOServiceImpl.java |  2 +-
 .../job/LawsTechnologyEvaluationJob.java      |  2 +-
 ...aluationComplianceResultEOServiceImpl.java | 29 ++++++++-----------
 ...LawsTechnologyEvaluationEOServiceImpl.java | 27 +++++------------
 .../feginClient/WorkFlowFeignClient.java      |  3 ++
 5 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java
index 0196e3a53..ec91475dc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java
@@ -11,7 +11,7 @@ import com.jero.modules.lawsOpinionGather.enums.LawsOpinionGatherNodeEnum;
 import com.jero.modules.lawsOpinionGather.enums.OperatorRoleCodeEnum;
 import com.jero.modules.lawsOpinionGather.mapper.LawsProcessHistoryEOMapper;
 import com.jero.modules.lawsOpinionGather.service.ILawsProcessHistoryEOService;
-import com.jero.modules.lawsTechnologyEvaluation.job.LawsTechnologyEvaluationNodeEnum;
+import com.jero.modules.lawsTechnologyEvaluation.enums.LawsTechnologyEvaluationNodeEnum;
 import com.jero.modules.project.enums.OperatorTypeEnum;
 import com.jero.modules.project.enums.RequestSourceEnum;
 import com.jero.modules.system.entity.SysUser;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationJob.java
index 43d11a9a9..63f308573 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationJob.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationJob.java
@@ -63,7 +63,7 @@ public class LawsTechnologyEvaluationJob implements Job {
 
                 if(CollectionUtils.isNotEmpty(lawsTechnologyEvaluationFlowDetailEOList)){
                     String actiProcInstIds = lawsTechnologyEvaluationFlowDetailEOList.stream().map(LawsTechnologyEvaluationFlowDetailEO::getActiProcInstId).distinct().collect(Collectors.joining(","));
-                    Result<String> result = this.workFlowFeignClient.completeTaskByPids(actiProcInstIds);
+                    Result<String> result = this.workFlowFeignClient.completeLawsTechnologyEvaluationTaskByPids(actiProcInstIds);
                     if(result.getCode().equals(CommonConstant.SC_OK_200)){
                         updateLawsTechnologyEvaluationEOList.forEach(lawsTechnologyEvaluationEO -> {
                             lawsTechnologyEvaluationEO.setFlowStatus(GatherResultEnum.COMPLETED.getValue());
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java
index 5040fe749..59b68e181 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java
@@ -137,7 +137,7 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
 		List<LawsTechnologyEvaluationComplianceResultEO> complianceResultEOList = this.baseMapper.selectList(queryWrapper);
 
 		if(CollectionUtils.isNotEmpty(complianceResultEOList)){
-
+			this.disposeData(complianceResultEOList,cut);
 			List<String> complianceResultIdList = complianceResultEOList.stream().map(LawsTechnologyEvaluationComplianceResultEO::getId).distinct().collect(Collectors.toList());
 			QueryWrapper<LawsTechnologyEvaluationResultEO> evaluationResultEOQueryWrapper = new QueryWrapper<>();
 			evaluationResultEOQueryWrapper.lambda().in(LawsTechnologyEvaluationResultEO::getComplianceResultId,complianceResultIdList);
@@ -179,14 +179,17 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
 		String title = "";
 		String bottomTitle = "";
 		String fileName = "";
+		String sheetName = "";
 		if(org.apache.commons.lang3.StringUtils.equals(cut, CutEnum.CN.getValue())){
 			title = "相关章节,问题说明,附件";
 			bottomTitle = "符合性结果：";
 			fileName = "评估结果 " + ".xlsx";
+			sheetName = "反馈结果";
 		}else if(org.apache.commons.lang3.StringUtils.equals(cut,CutEnum.EN.getValue())){
 			title = "Related section,Problem description,Accessory";
 			bottomTitle = "Compliance results:";
 			fileName = "Evaluation results " + ".xlsx";
+			sheetName = "Feedback result";
 		}
 
 		OutputStream os = null;
@@ -201,10 +204,12 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
 
 			//设置导出数据
 			if(CollectionUtils.isNotEmpty(exportData)) {
-				int size = exportData.size();
+				//创建表头
+				String[] titleArr = title.split(",");
+
 				for (int i = 0; i < exportData.size(); i++){
 					//使用评估人的名字命名sheet页
-					HSSFSheet sheet = workbook.createSheet(exportData.get(i).getCreateBy());
+					HSSFSheet sheet = workbook.createSheet(exportData.get(i).getCreateBy() + " " + sheetName);
 
 					CellStyle titleCellStyle = workbook.createCellStyle();
 					titleCellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中
@@ -212,11 +217,8 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
 					titleCellStyle.setWrapText(true);//自动换行
 
 					Row firstRow = sheet.createRow(0);
-
-					//创建表头
-					String[] titleArr = title.split(",");
-					for (int j=0; j<=3; j++){
-						sheet.setColumnWidth(j,4000);
+					for (int j=0; j<3; j++){
+						sheet.setColumnWidth(j,10000);
 						Cell cell = firstRow.createCell(j);
 						cell.setCellStyle(titleCellStyle);
 						cell.setCellValue(titleArr[j]);
@@ -236,18 +238,12 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
 
 					//把符合性结果设置进excel表格中。
 					Row bottomRow = sheet.createRow(evaluationResultListSize + 1);
-					Cell bottomRowFirstCell = bottomRow.getCell(0);
+					Cell bottomRowFirstCell = bottomRow.createCell(0);
 					bottomRowFirstCell.setCellStyle(titleCellStyle);
-					bottomRowFirstCell.setCellValue(bottomTitle);
-
-					Cell bottomRowSecondCell = bottomRow.getCell(1);
-					bottomRowSecondCell.setCellValue(exportData.get(i).getComplianceResultName());
+					bottomRowFirstCell.setCellValue(bottomTitle + " " + exportData.get(i).getComplianceResultName());
 				}
-
-
 			}
 
-
 			File fileTemp = new File(path);
 			if (fileTemp.exists()) {
 				fileTemp.delete();
@@ -291,7 +287,6 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
 						}
 					}
 				}
-
 			}
 			ZipUtil.zip(path, path + ".zip");
 			//文件
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
index df16067d3..333d1ad29 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
@@ -327,33 +327,22 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 			nowFile.mkdirs();
 
 			HSSFSheet sheet = workbook.createSheet("sheet1");
-			sheet.setDefaultColumnWidth(16);//列宽
-			HSSFCellStyle cellStyle = workbook.createCellStyle();
-			cellStyle.setWrapText(true);//自动换行
-			cellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中
-			cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//水平居中
 
-			HSSFCellStyle cellStyleTemp = workbook.createCellStyle();
-			cellStyleTemp.setWrapText(true);//自动换行
-
-			String explainInfo = null;
-
-			HSSFRichTextString explain = new HSSFRichTextString(explainInfo);
+			CellStyle titleCellStyle = workbook.createCellStyle();
+			titleCellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中
+			titleCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//水平居中
+			titleCellStyle.setWrapText(true);//自动换行
 
 			//表头
 			Row row = sheet.createRow(0);//开始创建标题行
 			String[] headerArr = title.split(",");
 			for (int m = 0; m < headerArr.length; m++) {
-				row.createCell(m).setCellValue(headerArr[m]);
+				sheet.setColumnWidth(m,10000);
+				Cell cell = row.createCell(m);
+				cell.setCellStyle(titleCellStyle);
+				cell.setCellValue(headerArr[m]);
 			}
 
-			/*Row rowExplain = sheet.createRow(1);
-			short height = (short) (7 * 200);
-			rowExplain.setHeight((short) height);
-			Cell cell = rowExplain.createCell(0);
-			cell.setCellValue(explain);
-			cell.setCellStyle(cellStyleTemp);*/
-
 			response.setHeader("Content-Disposition",
 					"attachment; filename=\"" + fileOriName + ".xls");
 			response.setContentType("application/force-download");
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java
index 59d7da450..1c48c7d24 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java
@@ -145,4 +145,7 @@ public interface WorkFlowFeignClient {
      */
     @RequestMapping(value = "/bat-wkflow/startLawsTechnologyEvaluationProcess",method = RequestMethod.POST,headers = {"content-type=application/json"})
     Result<String> startLawsTechnologyEvaluationProcess(String jsonObject);
+
+    @RequestMapping(value = "/bat-wkflow/task/completeLawsTechnologyEvaluationTaskByPids",method = RequestMethod.GET)
+    Result<String> completeLawsTechnologyEvaluationTaskByPids(@RequestParam("actiProcInstIds") String actiProcInstIds);
 }

From 832b866eecea3fe50f66bc06e2794eddcca86b4d Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 14 Jul 2022 18:14:06 +0800
Subject: [PATCH 094/103] update

---
 .../{job => enums}/LawsTechnologyEvaluationNodeEnum.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/{job => enums}/LawsTechnologyEvaluationNodeEnum.java (96%)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationNodeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/LawsTechnologyEvaluationNodeEnum.java
similarity index 96%
rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationNodeEnum.java
rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/LawsTechnologyEvaluationNodeEnum.java
index 745cb58d4..3cc205f1c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationNodeEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/LawsTechnologyEvaluationNodeEnum.java
@@ -1,4 +1,4 @@
-package com.jero.modules.lawsTechnologyEvaluation.job;
+package com.jero.modules.lawsTechnologyEvaluation.enums;
 
 import com.alibaba.druid.util.StringUtils;
 import com.jero.common.constant.enums.CutEnum;

From dccc534f74bf0354f2294e38db517fddc42ec044 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 14 Jul 2022 18:27:01 +0800
Subject: [PATCH 095/103] =?UTF-8?q?people-=E7=94=A8=E6=88=B7=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/system/mapper/SysUserMapper.java    |  2 ++
 .../jero/modules/system/mapper/xml/SysUserMapper.xml |  5 +++++
 .../system/service/impl/SyncDataServiceImpl.java     | 12 ++++++------
 .../system/service/impl/SysUserServiceImpl.java      |  6 +-----
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java
index 251bde680..9bacd0c8d 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java
@@ -149,4 +149,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 	 * @return
 	 */
 	List<SysUser> queryByDepIds(@Param("departIds")List<String> departIds,@Param("username") String username);
+
+	List<SysUser> getPPEmployeeList(@Param("thirdType") String thirdType);
 }
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
index 1b96854a8..6c22a7661 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
@@ -195,4 +195,9 @@
 			and username != #{username}
 		</if>
 	</select>
+
+	<select id="getPPEmployeeList" resultType="com.jero.modules.system.entity.SysUser">
+		select * from sys_user where third_type = #{thirdType}
+	</select>
+
 </mapper>
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java
index bb0397e54..9b820f396 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java
@@ -202,25 +202,25 @@ public class SyncDataServiceImpl implements ISyncDataService{
             List<SysUser> sysUserList = sysUserService.getPPEmployeeList();
 //            log.info("查询到的用户信息结果集为："+JSONObject.toJSONString(userEOList));
             for(SysUser user:sysUserList){
-                localUserMap.put(user.getId(),user);
+                localUserMap.put(user.getUsername(),user);
             }
 //            log.info("将用户信息集合转换为的用户MAP为："+JSONObject.toJSONString(localUserMap));
             log.info("开始更新数据库信息");
             for(PPEmployee ppEmployee:ppEmployeeList){
                 try {
-                    PPEmployeeMap.put(ppEmployee.getId(), ppEmployee);
+                    PPEmployeeMap.put(ppEmployee.getUser_name(), ppEmployee);
                     //1.判断当前账号是否已添加到用户中
-                    if (!localUserMap.containsKey(ppEmployee.getId())) {
+                    if (!localUserMap.containsKey(ppEmployee.getUser_name())) {
                         //删除数据库中与该账户相同的数据
-                        if(StringUtils.isNotBlank(ppEmployee.getId())) {
+                        if(StringUtils.isNotBlank(ppEmployee.getUser_name())) {
 //                            sysUserService.removeById(ppEmployee.getId()); // 这个为什么是逻辑删除
                             log.info("需要新增的用户信息为:" + JSONObject.toJSONString(ppEmployee));
                             SysUser newUser = sysUserService.addPPUserInfo(ppEmployee);
-                            localUserMap.put(ppEmployee.getId(), newUser);
+                            localUserMap.put(ppEmployee.getUser_name(), newUser);
                         }
 
                     } else {
-                        SysUser userEO = localUserMap.get(ppEmployee.getId());
+                        SysUser userEO = localUserMap.get(ppEmployee.getUser_name());
                         log.info("需要更新的用户信息为:" + JSONObject.toJSONString(userEO) + "     " + JSONObject.toJSONString(ppEmployee));
                         if(userEO != null) {
                             sysUserService.updatePPUserInfo(userEO, ppEmployee);
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
index 065a8b693..6b70e6909 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
@@ -1,6 +1,5 @@
 package com.jero.modules.system.service.impl;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -19,7 +18,6 @@ import com.jero.modules.base.service.BaseCommonService;
 import com.jero.modules.system.entity.*;
 import com.jero.modules.system.enums.PPSyncEnum;
 import com.jero.modules.system.mapper.*;
-import com.jero.modules.system.model.DepartIdModel;
 import com.jero.modules.system.model.SysUserSysDepartModel;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.vo.SysUserDepVo;
@@ -480,9 +478,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 	@Override
 	public List<SysUser> getPPEmployeeList() {
-		QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
-		sysUserQueryWrapper.lambda().eq(SysUser::getThirdType, PPSyncEnum.PP.getValue());
-		return list(sysUserQueryWrapper);
+		return this.baseMapper.getPPEmployeeList(PPSyncEnum.PP.getValue());
 	}
 
 	@Override

From 4b68f8ddf3f2d5681988e631789a6b9eb0cf7531 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 14 Jul 2022 18:58:06 +0800
Subject: [PATCH 096/103] =?UTF-8?q?people-=E7=94=A8=E6=88=B7=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/modules/system/entity/PPEmployee.java |  4 ++--
 .../system/service/impl/SyncDataServiceImpl.java   | 14 ++++++--------
 .../system/service/impl/SysUserServiceImpl.java    |  8 ++++----
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java
index 0890cb30b..68fbad730 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java
@@ -15,8 +15,8 @@ public class PPEmployee {
     private	String	data_difference; //数据来源[WORKDAY,XPT,NIOCAPITAL]
     private	String	employee_difference; //	员工来源[CN, EU_US,EU]
     private	String	employee_id; //	员工编号(员工唯一标识) ----workNo
-    private	String	worker_user_id; //WD帐号创建SSO账号 / AD账户 ----thirdId
-    private	String	user_name; //	WD同步到people的域帐号 ----username
+    private	String	worker_user_id; //WD帐号创建SSO账号 / AD账户 ----thirdId, username
+    private	String	user_name; //	WD同步到people的域帐号
 //    private	String	foreign_employee_id; //	兼职公司对应的员工编号
     private	String	name; //	全名
     private	String	formatted_name; //	全名-拼音及中文 ----realname
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java
index 9b820f396..7af3627da 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java
@@ -1,7 +1,6 @@
 package com.jero.modules.system.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jero.common.constant.CommonConstant;
@@ -25,7 +24,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.io.IOException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -202,25 +200,25 @@ public class SyncDataServiceImpl implements ISyncDataService{
             List<SysUser> sysUserList = sysUserService.getPPEmployeeList();
 //            log.info("查询到的用户信息结果集为："+JSONObject.toJSONString(userEOList));
             for(SysUser user:sysUserList){
-                localUserMap.put(user.getUsername(),user);
+                localUserMap.put(user.getThirdId(),user);
             }
 //            log.info("将用户信息集合转换为的用户MAP为："+JSONObject.toJSONString(localUserMap));
             log.info("开始更新数据库信息");
             for(PPEmployee ppEmployee:ppEmployeeList){
                 try {
-                    PPEmployeeMap.put(ppEmployee.getUser_name(), ppEmployee);
+                    PPEmployeeMap.put(ppEmployee.getWorker_user_id(), ppEmployee);
                     //1.判断当前账号是否已添加到用户中
-                    if (!localUserMap.containsKey(ppEmployee.getUser_name())) {
+                    if (!localUserMap.containsKey(ppEmployee.getWorker_user_id())) {
                         //删除数据库中与该账户相同的数据
-                        if(StringUtils.isNotBlank(ppEmployee.getUser_name())) {
+                        if(StringUtils.isNotBlank(ppEmployee.getWorker_user_id())) {
 //                            sysUserService.removeById(ppEmployee.getId()); // 这个为什么是逻辑删除
                             log.info("需要新增的用户信息为:" + JSONObject.toJSONString(ppEmployee));
                             SysUser newUser = sysUserService.addPPUserInfo(ppEmployee);
-                            localUserMap.put(ppEmployee.getUser_name(), newUser);
+                            localUserMap.put(ppEmployee.getWorker_user_id(), newUser);
                         }
 
                     } else {
-                        SysUser userEO = localUserMap.get(ppEmployee.getUser_name());
+                        SysUser userEO = localUserMap.get(ppEmployee.getWorker_user_id());
                         log.info("需要更新的用户信息为:" + JSONObject.toJSONString(userEO) + "     " + JSONObject.toJSONString(ppEmployee));
                         if(userEO != null) {
                             sysUserService.updatePPUserInfo(userEO, ppEmployee);
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
index 6b70e6909..e457b8b91 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
@@ -487,11 +487,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		SysUser sysUser = new SysUser();
 		// 基本信息
 		sysUser.setId(ppEmployee.getId());
-		sysUser.setUsername(ppEmployee.getUser_name());
+		sysUser.setUsername(ppEmployee.getWorker_user_id());
 		sysUser.setRealname(ppEmployee.getFormatted_name());
 		sysUser.setStatus("Active".equals(ppEmployee.getEmployee_status())? CommonConstant.USER_UNFREEZE : CommonConstant.USER_FREEZE);
 		sysUser.setDelFlag("1".equals(ppEmployee.getDelete_flag())? CommonConstant.DEL_FLAG_0 : CommonConstant.DEL_FLAG_1);
-		sysUser.setThirdId(ppEmployee.getUser_name());
+		sysUser.setThirdId(ppEmployee.getWorker_user_id());
 		sysUser.setActivitiSync(CommonConstant.ACT_SYNC_1);
 		sysUser.setWorkNo(ppEmployee.getEmployee_id());
 		sysUser.setWorkerType("Employee".equals(ppEmployee.getWorker_type())? CommonConstant.WORKER_TYPE_1 : CommonConstant.WORKER_TYPE_2);
@@ -531,11 +531,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	public void updatePPUserInfo(SysUser sysUser, PPEmployee ppEmployee) {
 
 		// 基本信息
-		sysUser.setUsername(ppEmployee.getUser_name());
+		sysUser.setUsername(ppEmployee.getWorker_user_id());
 		sysUser.setRealname(ppEmployee.getFormatted_name());
 		sysUser.setStatus("Active".equals(ppEmployee.getEmployee_status())? CommonConstant.USER_UNFREEZE : CommonConstant.USER_FREEZE);
 		sysUser.setDelFlag("1".equals(ppEmployee.getDelete_flag())? CommonConstant.DEL_FLAG_0 : CommonConstant.DEL_FLAG_1);
-		sysUser.setThirdId(ppEmployee.getUser_name());
+		sysUser.setThirdId(ppEmployee.getWorker_user_id());
 		sysUser.setWorkNo(ppEmployee.getEmployee_id());
 		sysUser.setWorkerType("Employee".equals(ppEmployee.getWorker_type())? CommonConstant.WORKER_TYPE_1 : CommonConstant.WORKER_TYPE_2);
 		sysUser.setCreateTime(ppEmployee.getCreation_time());

From 8d810fe6748e6600f0cdb7450372f90f746b52d1 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Fri, 15 Jul 2022 09:26:17 +0800
Subject: [PATCH 097/103] =?UTF-8?q?people-=E7=94=A8=E6=88=B7=E8=A1=A8?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=83=A8=E5=88=86=E7=B4=A2=E5=BC=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 42b9bed98..1961473e9 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -380,3 +380,8 @@ ALTER TABLE `laws_weilai`.`params_report_detail`
 -- 法规技术评估 反馈评估表中，增加符合性结果表id关联  2022-07-14
 ALTER TABLE `laws_technology_evaluation_result`
     ADD COLUMN `compliance_result_id` varchar(64) NULL COMMENT '符合性结果id' AFTER `acti_proc_inst_id`;
+
+-- 用户表 删除索引 2022-07-14 已同步
+ALTER TABLE `laws_weilai`.`sys_user`
+DROP INDEX `uniq_sys_user_phone`,
+DROP INDEX `uniq_sys_user_email`;
\ No newline at end of file

From a0906e88de818ffd7f98a3b8f47aa77dd1d3d2c1 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Fri, 15 Jul 2022 10:07:13 +0800
Subject: [PATCH 098/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E9=92=88=E5=AF=B9=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B=E6=97=B6=EF=BC=8C=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E9=80=9A=E8=BF=87id=E6=9F=A5=E8=AF=A2=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E5=BA=93=E6=95=B0=E6=8D=AE=EF=BC=8C=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E5=87=BA=E6=9D=A5=E6=96=87=E6=A1=A3=E5=BA=93id=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BussDocumentLibraryEOServiceImpl.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 655b5e6f3..6084eef24 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
@@ -450,7 +450,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                             .collect(Collectors.toList());
                 }
             } else {
-                fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(StringUtils.valueOf(e.getIsQuery()))).collect(Collectors.toList());
+                fieldList = fieldList.stream().filter(e -> {
+                    boolean showFlag = false;
+                    if(YesOrNoEnum.YES.getValue().equals(StringUtils.valueOf(e.getIsQuery())) || e.getDbFieldName().equals("id")){
+                        showFlag = true;
+                    }
+                    return showFlag;
+                }).collect(Collectors.toList());
                 if(CutEnum.CN.getValue().equals(cut)){
                     fieldList = fieldList.stream().filter(e->!"title_en".equals(e.getDbFieldName())).collect(Collectors.toList());
                 }else{

From 865e5ce63b01499ca16866a811575f3255bd7f9d Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 15 Jul 2022 10:41:54 +0800
Subject: [PATCH 099/103] =?UTF-8?q?=E9=80=9A=E8=BF=87id=E6=9F=A5=E6=89=BE?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../document/service/impl/BussDocumentLibraryEOServiceImpl.java | 2 ++
 1 file changed, 2 insertions(+)

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 6084eef24..847538ce3 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
@@ -3637,6 +3637,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                 }
                                 conditionSb.append(" and " + key + " like concat(concat('%','" + value + "'),'%') ESCAPE '/'");
 //                                conditionSb.append(" and " + key + " like concat(concat('%','" + value + "'),'%')");
+                            } else if (StringUtils.equals(fieldName,"id")){
+                                conditionSb.append(" and " + key + " ='" + value + "'");
                             }
                         }
                     }

From 84e9cea1af98b0598cc775144875794ae93db728 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 15 Jul 2022 11:05:25 +0800
Subject: [PATCH 100/103] =?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            |  6 ++-
 .../components/evaluationResultsClause.vue    |  7 ++-
 .../components/evaluationResultsWhole.vue     |  7 ++-
 .../components/initiatingProcess.vue          | 47 +++++++++++++++++--
 .../technologyAssessment/index.vue            | 11 ++---
 5 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
index 5c9aa7475..98f2bc425 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
@@ -165,8 +165,10 @@
       submitData(callback) {
         let dataList = JSON.parse(JSON.stringify(this.dataList))
         for (let i = 0; i < dataList.length; i++) {
-          dataList[i].evaluationMethods = dataList[i].evaluationMethods.join(',')
-          dataList[i].lawsTechnologyEvaluationId = this.getUUID
+          if (dataList[i].evaluationMethods && dataList[i].evaluationMethods instanceof Array) {
+            dataList[i].evaluationMethods = dataList[i].evaluationMethods.join(',')
+          }
+          dataList[i].lawsTechnologyEvaluationId = this.$route.query.lawsTechnologyEvaluationId || this.getUUID
           if (!dataList[i].evaluationMethods || !dataList[i].evaluatorIds) {
             this.$message.warning(this.$t('pleaseCompleteTheEvaluationMethodorEvaluator'))
             return
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue
index 0eb59c342..b9b258dad 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue
@@ -226,13 +226,18 @@
       }
     },
     mounted() {
+      document.title = this.$route.query.serialNumber + ' ' + this.$t('regulatoryTechnicalEvaluationResults')
       this.getList()
     },
     methods: {
       CurrentStandard() {
         let query = {
           firstInitiation: '2',
-          whetherTobring: '1'
+          whetherTobring: '1',
+          processBackground: this.$route.query.processBackground || '',
+          remark: this.$route.query.remark || '',
+          standId: this.$route.query.standId,
+          lawsTechnologyEvaluationId:this.$route.query.lawsTechnologyEvaluationId
         }
         let newUrl = this.$router.resolve({
           path: '/evaluationInitiationProcess',
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
index 8d83206c5..7c54837f7 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
@@ -110,13 +110,18 @@
       }
     },
     mounted() {
+      document.title = this.$route.query.serialNumber +' '+this.$t('regulatoryTechnicalEvaluationResults')
       this.getList()
     },
     methods: {
       CurrentStandard() {
         let query = {
           firstInitiation: '2',
-          whetherTobring: '2'
+          whetherTobring: '2',
+          processBackground:this.$route.query.processBackground || '',
+          remark:this.$route.query.remark || '',
+          standId:this.$route.query.standId,
+          lawsTechnologyEvaluationId:this.$route.query.lawsTechnologyEvaluationId
         }
         let newUrl = this.$router.resolve({
           path: '/evaluationInitiationProcess',
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
index b89247abf..09874fbdd 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -99,6 +99,7 @@
                 <a-form-model-item class="itemModel" prop="taskExplain">
                   <a-textarea :placeholder="$t('pleaseEnter')+$t('processBackground')"
                               v-model="formInline.processBackground"
+                              :disabled="!whetherDisplay"
                               :rows="4"/>
                 </a-form-model-item>
               </div>
@@ -113,6 +114,7 @@
                 <a-form-model-item class="itemModel" prop="remarks">
                   <a-textarea :placeholder="$t('pleaseEnter')+$t('remarks')"
                               v-model="formInline.remark"
+                              :disabled="!whetherDisplay"
                               :rows="4"/>
                 </a-form-model-item>
               </div>
@@ -290,7 +292,6 @@
     },
     mounted() {
       document.title = this.$t('regulatoryEngineer') + this.$t('initiatingProcess')
-      this.getList()
       this.getEvaluationMethodTree()
       if (this.$route.query.whetherTobring == '1') {
         this.isTrue = true
@@ -299,8 +300,14 @@
       }
       if (this.$route.query.firstInitiation == '1') {
         this.whetherDisplay = true
+        this.getList()
       } else {
         this.whetherDisplay = false
+        this.formInline.processBackground = this.$route.query.processBackground
+        this.formInline.lawsTechnologyEvaluationId = this.$route.query.lawsTechnologyEvaluationId
+        this.formInline.remark = this.$route.query.remark
+        this.formInline.standId = this.$route.query.standId
+        this.getListOne()
       }
       eventBUs.$on('searchQuery', search => {
         Object.keys(search).forEach(res => {
@@ -333,6 +340,36 @@
         this.pageSize = pageSize
         this.getList()
       },
+      getListOne() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          id: this.formInline.standId
+        }
+        this.loading = true
+        let url = ''
+        if (this.isTrue) {
+          url = this.url.addModelListOne
+        } else {
+          url = this.url.addModelList
+        }
+        postAction(url, query).then((res) => {
+          if (res.success) {
+            let content = res.result.records || []
+            this.selectedRowKeysRecord.push({
+              standId: content[0].id,
+              serialNumber: content[0].serial_number,
+              title: content[0].title,
+              technologyTerritory: content[0].technology_territory_id
+            })
+            this.standardDecomposition = content
+            this.loading = false
+          } else {
+            this.dataSource = []
+            this.loading = false
+          }
+        })
+      },
       getList() {
         let query = {
           pageNo: this.pageNo,
@@ -463,7 +500,7 @@
         value.startTime = startTime
         value.flowStatus = 'Underway'
         value.taskAffirmDueDate = value.endTime
-        if (!value.lawsTechnologyEvaluationId){
+        if (!value.lawsTechnologyEvaluationId) {
           value.lawsTechnologyEvaluationId = this.getUUID()
         }
         value.regulationOwnerId = this.userInfo().id
@@ -532,7 +569,11 @@
     }
   }
 </script>
-
+<style>
+  .ant-input-disabled {
+    color: rgba(0, 0, 0, 0.65) !important;
+  }
+</style>
 <style scoped>
   .detail-box {
     padding: 67px 0 0 0;
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
index f0d7db090..6521ae1c7 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
@@ -369,9 +369,9 @@
               id: row.id,
               processBackground: row.processBackground,
               serialNumber: row.serialNumber,
-              title: row.title,
-              technologyTerritory: row.technologyTerritory,
-              standId: row.standId
+              lawsTechnologyEvaluationId:row.id,
+              standId: row.standId,
+              remark:row.remark
             }
           })
           window.open(newUrl.href, '_blank')
@@ -382,9 +382,8 @@
               id: row.id,
               processBackground: row.processBackground,
               serialNumber: row.serialNumber,
-              title: row.title,
-              technologyTerritory: row.technologyTerritory,
-              standId: row.standId
+              standId: row.standId,
+              remark:row.remark
             }
           })
           window.open(newUrl.href, '_blank')

From 34b32a3057057501d9a70b5278912e383a4a5cdc Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 15 Jul 2022 11:28:17 +0800
Subject: [PATCH 101/103] =?UTF-8?q?=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E6=80=A7=E7=9C=8B=E6=9D=BF=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   6 +
 jero-web/src/common/lang/zh-cn.js             |   6 +
 .../regulationsKanban/components/addModel.vue | 382 +++++++++++++++
 .../src/views/regulationsKanban/index.vue     | 452 ++++++++++++++++++
 4 files changed, 846 insertions(+)
 create mode 100644 jero-web/src/views/regulationsKanban/components/addModel.vue
 create mode 100644 jero-web/src/views/regulationsKanban/index.vue

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 41480baf8..8937ba8bb 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1145,4 +1145,10 @@ module.exports = {
   translationLanguage:'Translation language',
   translationResults:'Translation results',
   conversionTime:'Conversion time',
+  category:'Category',
+  RegulatoryProcessEvaluationResults :'Regulatory Process Evaluation Results',
+  ViewConformanceResults:'View Conformance Results',
+  CommentsCollectionResultsForReference:'Comments Collection Results For Reference',
+  TechnicalEvaluationResultsForReference:'Technical Evaluation Results For Reference',
+  ComplianceConfirmationRecord:'Compliance Confirmation Record',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 98f362d10..00f2de06b 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1149,4 +1149,10 @@ module.exports = {
   translationLanguage:'翻译语言',
   translationResults:'翻译结果',
   conversionTime:'转换时间',
+  category:'类别',
+  RegulatoryProcessEvaluationResults :'法规流程评估结果',
+  ViewConformanceResults:'查看符合性结果',
+  CommentsCollectionResultsForReference:'意见收集结果参考',
+  TechnicalEvaluationResultsForReference:'技术评估结果参考',
+  ComplianceConfirmationRecord:'符合性确认记录',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue
new file mode 100644
index 000000000..6039934a4
--- /dev/null
+++ b/jero-web/src/views/regulationsKanban/components/addModel.vue
@@ -0,0 +1,382 @@
+<template>
+  <div class='diolag-area'>
+    <a-spin :spinning='spinLoading'>
+      <a-form-model
+        class='tag-module'
+        ref='ruleForm'
+        :model='formData'
+        :rules='rules'
+        :label-col='labelCol'
+        :wrapper-col='wrapperCol'
+      >
+        <a-row :gutter='24'>
+          <a-col :span='9'>
+            <a-form-model-item :label="$t('areaOfResponsibility')">
+              <j-dict-select-tag class="box-input" v-model="formData.areaOfResponsibility"
+                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'duty_territory'"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span='9'>
+            <a-form-model-item :label="$t('RelatedItems')" prop='ListTitle'>
+              <a-select class="box-input" v-model="formData.RelatedItems"
+                        :placeholder="$t('PleaseSelect')+$t('RelatedItems')">
+                <a-select-option v-for="(element,index) in item.RelatedItemList" :key="element.value" :value="element.value">
+                  {{element.label}}
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span='6' style='margin-top: 4px;'>
+            <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-col>
+        </a-row>
+      </a-form-model>
+    </a-spin>
+    <div class="table-operator" style='float: right;margin-top: -20px'>
+      <a-button type="primary" icon="download" @click="handleExportXls()">{{ $t('export') }}</a-button>
+    </div>
+<!--    :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'-->
+    <a-table
+      class='table-area'
+      ref='table'
+      size='middle'
+      rowKey='id'
+      :columns='columns'
+      :dataSource='areaTable'
+      :pagination='false'
+      :loading='loading'
+      :scroll='{x: 600}'
+
+      @change='handleTableChange'>
+
+<!--      <template slot="file" slot-scope="text, record">-->
+<!--        <a class="action-edit" href="javascript:;" @click="dowloadfile(record)" v-has="'bqnrzdpzxlbj'">{{record.exportFileName}}</a>-->
+<!--      </template>-->
+    </a-table>
+<!--    <div class="page" style='display: flex;justify-content: flex-end;'>-->
+<!--      <a-pagination-->
+<!--        :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
+<!--        show-quick-jumper-->
+<!--        show-size-changer-->
+<!--        :page-size.sync="pageSize"-->
+<!--        :total="total"-->
+<!--        :current="pageNo"-->
+<!--        @change="pageOnChange"-->
+<!--        @showSizeChange="SizeChange"-->
+<!--      />-->
+<!--    </div>-->
+    <div class="table-operator" >
+      <a-button type="primary"  @click="handleExportXls()">{{ $t('CommentsCollectionResultsForReference') }}</a-button>
+      <a-button type="primary"  @click="handleExportXls()">{{ $t('TechnicalEvaluationResultsForReference') }}</a-button>
+    </div>
+    <!--    <div class='drawer-bootom-button'>-->
+    <!--      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>-->
+    <!--      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>-->
+    <!--    </div>-->
+  </div>
+</template>
+
+<script>
+import { putAction, postAction, getAction, deleteAction ,downloadFile } from '@/api/manage'
+import axios from 'axios'
+import Vue from 'vue'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
+
+export default {
+  name: 'diolagArea',
+  components: {},
+  data() {
+    return {
+      token:Vue.ls.get(ACCESS_TOKEN),
+      title: this.$t('add'),
+      total: 0,
+      selectedRowKeysDate: {},
+      loading: false,
+      editId: '',
+      RelatedItemList:[],
+      columns: [
+        {
+          title: this.$t('areaOfResponsibility'),
+          dataIndex: 'areaOfResponsibility',
+          width: 120,
+          align: 'center',
+          ellipsis: true
+        },
+        {
+          title: this.$t('RelatedItems'),
+          align: 'center',
+          width: 120,
+          dataIndex: 'RelatedItems',
+          ellipsis: true
+        },
+        {
+          title: this.$t('designComplianceReview'),
+          align: 'center',
+          width: 250,
+          dataIndex: 'designComplianceReview',
+          ellipsis: true
+        },
+        {
+          title: this.$t('preHomeConfirmation'),
+          align: 'center',
+          width: 270,
+          dataIndex: 'preHomeConfirmation',
+          ellipsis: true
+        },
+        {
+          title: this.$t('verificationComplianceReview'),
+          align: 'center',
+          width: 270,
+          dataIndex: 'verificationComplianceReview',
+          scopedSlots: { customRender: 'file' },
+          ellipsis: true
+        }
+      ],
+      newVisible: false,
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 7 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 14 }
+      },
+      form: {},
+      formData: {
+        projectName:'',
+      },
+      rules: {
+        title: [
+          { required: true, message: this.$t('enterTitle'), trigger: 'blur' }
+        ]
+      },
+      areaTable: [],
+      flag: false,  //表单提交标识
+      spinLoading: false,
+      confirmLoading: false,
+      selectedRowKeys: [],
+      pageNo: 1,
+      pageSize: 10,
+      listVisible: false,
+      listVisibleRowDate: {}
+    }
+  },
+  props: {
+    version: {
+      type: Number,
+      default: '',
+      required: false
+    },
+    projectId: {
+      type: String,
+      default: '',
+      require: true
+    },
+    item: {
+      type: String,
+      default: '',
+      require: true
+    },
+    paramsManifestId: {
+      type: Object,
+      default: '',
+      require: true
+    },
+    url: {
+      type: Object,
+      default: '',
+      require: true
+    }
+  },
+  mounted() {
+    this.loadData()
+    console.log(this.item)
+  },
+  methods: {
+    // 清单列表传出数据
+    listVisibleRow(val) {
+      this.selectedRowKeys = []
+      let newAreaTable=JSON.parse(JSON.stringify(this.areaTable))
+      newAreaTable.forEach((item, index) => {
+        if( item.id == this.listVisibleRowDate.id ) {
+          let _obj = {...item}
+          _obj.paramsTemplateId = val[0].id
+          _obj.paramsTemplateName = val[0].paramsTemplateName
+          this.areaTable.splice(index, 1,_obj)
+        }
+      })
+      console.log(this.areaTable,'this.areaTable')
+      this.listVisible = false
+    },
+    // 下载文件
+    editArea(val) {
+      // this.listVisibleRowDate = val
+      console.log(val)
+      // this.listVisible = true
+    },
+    pageOnChange(page, pageSize) {
+      this.pageNo = page
+      this.loadData()
+    },
+    SizeChange(page, pageSize) {
+      this.pageNo = 1
+      this.pageSize = pageSize
+      this.loadData()
+    },
+    dowloadfile(item){
+      let query = {
+        id: item.exportFileId
+      }
+      downloadFile('/sys/common/downLoadFile', item.exportFileName, query, this.Deselect)
+    },
+    loadData() {
+      let _this = this
+      let params = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        paramsManifestId:this.paramsManifestId,
+        ...this.formData
+      }
+      getAction('params/report/exportHistoryPage', params).then((res) => {
+        if (res.success) {
+          this.areaTable = res.result.records
+          this.total = res.result.total
+        }
+      })
+    },
+    //导出
+    handleExportXls(){
+
+    },
+    searchQuery() {
+      this.loadData()
+    },
+    searchReset() {
+      this.formData = {}
+      this.loadData()
+    },
+    handleCancel() {
+      this.$emit('areaVisible', false)
+    },
+    onSelectChange(selectedRowKeys, selectedRowKeysDate) {
+      this.selectedRowKeysDate = selectedRowKeysDate
+      this.selectedRowKeys = selectedRowKeys
+    },
+    handleTableChange(val) {
+      console.log(',,,')
+    },
+    showModal() {
+      this.title = this.$t('add')
+      this.newVisible = true
+      this.form = {}
+    },
+    //新增
+    handleSubmit() {
+      let _this = this
+      if (this.selectedRowKeys.length == 0) {
+        this.$message.warning(this.$t('pleaseSelectData'))
+      } else if (this.selectedRowKeys.length > 1) {
+        this.$message.warning(this.$t('OnlyOneSelected'))
+      } else {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            this.flag = true
+            this.spinLoading = true
+            this.confirmLoading = true
+            let _tt = {
+              paramsTemplateId: this.selectedRowKeysDate[0].paramsTemplateId,
+              projectId: this.selectedRowKeysDate[0].projectId,
+              title: this.selectedRowKeysDate[0].title,
+              paramsTemplatePublishVersion: this.selectedRowKeysDate[0].paramsTemplatePublishVersion,
+              sourceManifestId: this.selectedRowKeysDate[0].id,
+            }
+            axios({
+              url: `/jero-boot/params/manifest/copy`,
+              method: 'post',
+              data: _tt,
+              transformRequest: [function (data) {
+                let ret = ''
+                for (let it in data) {
+                  ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+                }
+                return ret
+              }],
+              headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+                'X-Access-Token':_this.token
+              }
+            })
+              .then( (res) =>{
+                if (res.data.success) {
+                  _this.$emit('copysubmit')
+                  _this.$message.success(res.data.message)
+                  _this.flag = false
+                  _this.spinLoading = false
+                  _this.confirmLoading = false
+                }else{
+                  _this.$message.warning(res.data.message)
+                  _this.flag = false
+                  _this.spinLoading = false
+                  _this.confirmLoading = false
+                }
+              })
+              .catch( (error) =>{
+                console.log(error);
+              });
+          } else {
+            return false
+          }
+        })
+      }
+    },
+  },
+  watch: {
+    selectedRowKeyS(val) {
+      this.selectedRowKeys = val
+    }
+  }
+
+}
+</script>
+
+<style lang='less' scoped>
+@import '~@assets/less/common.less';
+
+.diolag-area {
+  .table-area {
+    margin: 20px 0;
+
+    .action-edit {
+      margin-right: 10px;
+    }
+  }
+
+  .table-del {
+    color: red;
+  }
+}
+.drawer-bootom-button{
+  display: flex;
+  justify-content: center;
+}
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+</style>
+<style lang='less'>
+.area-module {
+  .ant-modal-wrap {
+    .ant-modal {
+      .ant-modal-content {
+        .ant-modal-footer {
+          text-align: center;
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue
new file mode 100644
index 000000000..37e7d1b14
--- /dev/null
+++ b/jero-web/src/views/regulationsKanban/index.vue
@@ -0,0 +1,452 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standard')">
+                <span>{{ $t('standard') }}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                       v-model="queryParam.serialNumber"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('title')">
+                <span>{{$t('title')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.projectName"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('status')">
+                <span>{{ $t('status') }}</span>
+              </div>
+              <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+                                 :placeholder="$t('PleaseSelect')+$t('status')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'duty_territory'"/>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('technicalField')">
+                <span>{{ $t('technicalField') }}</span>
+              </div>
+              <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+                                 :placeholder="$t('PleaseSelect')+$t('technicalField')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'duty_territory'"/>
+            </div>
+          </a-col>
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                   <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                        @handleSuperQuery="handleSuperQuery"
+                                        :fieldList="fieldList"/>
+                  <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-col>
+            </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: true}"
+        rowKey="id"
+        :data-source="dataSource"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :columns="columns"
+      >
+        <span slot="projectName" slot-scope="text,record" :title="text">
+          <a @click="entryNameClick(record)">
+            {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}
+          </a>
+        </span>
+        <span slot="operation" slot-scope="text,record">
+            <a class="text-operation" @click="handlecody(record)">{{$t('ViewConformanceResults')}}</a>
+        </span>
+      </a-table>
+    </div>
+    <div class="page">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        :current="pageNo"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+    <!--     导出历史模板-->
+    <a-modal class="show-drawer" :title="titleTag" width="1200px" v-model="drawerVisible" :footer="null">
+      <export-history v-if='drawerVisible' @areaVisible='drawerVisible = false' :paramsManifestId='paramsManifestId' :item='item'></export-history>
+    </a-modal>
+  </a-card>
+</template>
+
+<script>
+import ExportHistory from './components/addModel'
+import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
+import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
+import axios from 'axios'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
+// import eventBUs from '../../../common/event'
+import Vue from 'vue'
+
+export default {
+  name: 'index',
+  components: {
+    ExportHistory,
+    globalAdvancedQuery
+  },
+  data() {
+    return {
+      token: Vue.ls.get(ACCESS_TOKEN),
+      loading: false,
+      toggleSearchStatus: false,
+      selectedRowKeys: [],
+      paramsManifestId:'',
+      item:{},
+      selectedRowKeysArray: '',
+      formInline: {},
+      rules: {
+        paramsTemplateName: [
+          { required: true, message: this.$t('PleaseEnter') + this.$t('templateName'), trigger: 'change' }
+        ]
+      },
+      fieldList: [
+        {
+          type: 'string',
+          value: 'standard',
+          text: this.$t('standard')
+        },
+        {
+          type: 'string',
+          value: 'title',
+          text: this.$t('title')
+        },
+        {
+          type: '',
+          value: 'status',
+          text: this.$t('status'),
+          dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+        },
+        {
+          type: 'string',
+          value: 'category',
+          text: this.$t('category')
+        },
+        {
+          type: '',
+          value: 'technicalField',
+          text: this.$t('technicalField'),
+          dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+        },
+      ],
+      visible: false,
+      dataSource: [],
+      confirmLoading: false,
+      url: {
+        list: 'params/report/page'
+      },
+      total: 0,
+      pageSize: 10,
+      pageNo: 1,
+      title: '新增',
+      columns: [
+        {
+          title: this.$t('standard'),
+          align: 'center',
+          width: '10%',
+          dataIndex: 'standard'
+        },
+        {
+          title: this.$t('title'),
+          align: 'center',
+          width: '10%',
+          dataIndex: 'title'
+        },
+        {
+          title: this.$t('status'),
+          align: 'center',
+          dataIndex: 'status'
+        },
+        {
+          title: this.$t('category'),
+          align: 'center',
+          dataIndex: 'category'
+        },
+        {
+          title: this.$t('technicalField'),
+          align: 'center',
+          dataIndex: 'technicalField'
+        },
+        {
+          title: this.$t('RegulatoryProcessEvaluationResults'),
+          align: 'center',
+          fixed: 'right',
+          width: 250,
+          scopedSlots: { customRender: 'operation' }
+        }
+      ],
+      queryParam: {},
+      areaVisible: false,
+      paramsTemplateName: '',
+      drawerVisible: false,
+      titleTag: ''
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    handleCancel() {
+      this.areaVisible = false
+    },
+    handleSubmit() {
+      if (this.formInline.paramsTemplateName !== undefined) {
+        this.formInline.paramsTemplateName = this.formInline.paramsTemplateName.trim()
+      }
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          getAction(this.url.copy + `?id=${this.selectedRowKeys[0]}&paramsTemplateName=${this.formInline.paramsTemplateName}`, {}).then((res) => {
+            if (res.success) {
+              this.areaVisible = false
+              this.$message.success(res.message)
+              this.selectedRowKeys = []
+              this.getList()
+            } else {
+              this.$message.warning(res.message)
+            }
+          })
+        }
+      })
+    },
+    handleToggleSearch() {
+      this.toggleSearchStatus = !this.toggleSearchStatus
+    },
+    onSelectChange(value) {
+      this.selectedRowKeys = value
+      this.selectedRowKeysArray = this.selectedRowKeys.join(',')
+    },
+    // 导出历史
+    handlecody(e) {
+      this.drawerVisible = true
+      this.titleTag = e.standard + this.$t('ComplianceConfirmationRecord')
+      this.paramsManifestId = e.id
+      this.item = {...e}
+    },
+    hideModal() {
+      this.visible = false
+    },
+    //编辑
+    edit(item) {
+      this.$refs.addModelRef.editModel(JSON.parse(JSON.stringify(item)))
+    },
+    //删除
+    deleteLib(val) {
+      let newUrl = this.$router.resolve({
+        path: '/managementdetails',
+        query: val
+      })
+      window.open(newUrl.href, '_blank')
+    },
+    //虚拟清单名称事件
+    entryNameClick(item) {
+      this.$router.push({
+        path: '/ParameterTemplateList',
+        query: item
+      })
+    },
+    searchQuery() {
+      this.pageNo = 1
+      this.getList()
+    },
+    searchReset() {
+      this.queryParam = {}
+      this.$refs.globalAdvancedQueryRef.resetLine()
+      this.$refs.globalAdvancedQueryRef.emitCallback()
+    },
+    pageOnChange(page, pageSize) {
+      this.pageNo = page
+      this.getList()
+    },
+    SizeChange(page, pageSize) {
+      this.pageNo = 1
+      this.pageSize = pageSize
+      this.getList()
+    },
+    addModelList() {
+      this.pageNo = 1
+      this.getList()
+    },
+    PersonnelSelectionChange(value, id) {
+      this.queryParam[value] = id
+      this.queryParam = { ...this.queryParam }
+    },
+    handleSuperQuery(params, matchType) {
+      let sqp = {}
+      if (!params || (params && params.length == 0)) {
+        sqp['superQueryParams'] = ''
+        this.$refs.globalAdvancedQueryRef.superQueryFlag = false
+      } else {
+        this.$refs.globalAdvancedQueryRef.superQueryFlag = true
+        sqp['superQueryParams'] = encodeURI(JSON.stringify(params))
+        sqp['superQueryMatchType'] = matchType
+      }
+      this.queryParamQuery = sqp
+      this.getList()
+    },
+    getList() {
+      let query = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        ...this.queryParamQuery,
+        ...this.queryParam
+      }
+      this.loading = true
+      getAction(this.url.list, query).then((res) => {
+        if (res.success) {
+          if (res.result.current > 1 && res.result.records.length == 0) {
+            this.pageNo = res.result.current - 1
+            this.getList()
+            return
+          }
+          this.dataSource = res.result.records || []
+
+          this.total = res.result.total
+          this.loading = false
+        } else {
+          this.loading = false
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+@import '~@assets/less/common.less';
+
+.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;
+}
+
+.add-input {
+  width: 82%;
+}
+
+.box-button {
+  height: 38px;
+  /*margin-top: 2px;*/
+}
+
+.text-operation {
+  margin-right: 8px;
+}
+
+.page {
+  text-align: right;
+  margin-top: 20px;
+}
+
+.box-title-text-add {
+  line-height: 1.4;
+  display: flex;
+}
+
+.title-text-add {
+  width: 114px;
+  text-align: right;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 42px;
+  margin-top: 3px;
+}
+
+.box-input-add {
+  display: inline-block;
+  height: 38px;
+  width: 100%;
+}
+
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
+
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+
+.title-text-text {
+  margin-top: 9px;
+}
+
+.formAdd {
+  margin-bottom: 40px;
+}
+
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  z-index: 100;
+  width: 100%;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+
+.add-text-text {
+  margin-top: -14px;
+}
+</style>

From 81f79f6d1e53f82e2a838b1738d1a738f8d3b264 Mon Sep 17 00:00:00 2001
From: xiaowenyu <xiaowenyu>
Date: Fri, 15 Jul 2022 13:31:32 +0800
Subject: [PATCH 102/103] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=87=E6=B3=A8=E5=B7=B2=E5=90=8C=E6=AD=A5=E6=AD=A3?=
 =?UTF-8?q?=E5=BC=8F=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 1961473e9..44aae6736 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -361,7 +361,7 @@ ALTER TABLE `laws_weilai`.`report_cert_category_params_info`
     MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `params_name`;
 --以上SQL 2022年7月12日 已同步正式环境
 
--- 参数项清单表 添加字段 标题默认值 2022-07-13
+-- 参数项清单表 添加字段 标题默认值 2022-07-13 已同步正式环境
 ALTER TABLE `laws_weilai`.`params_info`
     ADD COLUMN `title_default_value` varchar(100) NULL COMMENT '标题默认值' AFTER `params_template_id`;
 
@@ -377,7 +377,7 @@ ALTER TABLE `laws_weilai`.`params_collect_manifest_history`
 ALTER TABLE `laws_weilai`.`params_report_detail`
     ADD COLUMN `title_default_value` varchar(100) NULL COMMENT '标题默认值' AFTER `sync_time`;
 
--- 法规技术评估 反馈评估表中，增加符合性结果表id关联  2022-07-14
+-- 法规技术评估 反馈评估表中，增加符合性结果表id关联  2022-07-14  已同步正式环境
 ALTER TABLE `laws_technology_evaluation_result`
     ADD COLUMN `compliance_result_id` varchar(64) NULL COMMENT '符合性结果id' AFTER `acti_proc_inst_id`;
 

From dffe45c58b196aaa93fb3066f573525c8d7cd68b Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Fri, 15 Jul 2022 14:19:50 +0800
Subject: [PATCH 103/103] =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E6=A0=B9=E6=8D=AEid?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=87=E6=A1=A3=E5=BA=93=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BussDocumentLibraryEOServiceImpl.java | 10 +---------
 1 file changed, 1 insertion(+), 9 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 847538ce3..655b5e6f3 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
@@ -450,13 +450,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                             .collect(Collectors.toList());
                 }
             } else {
-                fieldList = fieldList.stream().filter(e -> {
-                    boolean showFlag = false;
-                    if(YesOrNoEnum.YES.getValue().equals(StringUtils.valueOf(e.getIsQuery())) || e.getDbFieldName().equals("id")){
-                        showFlag = true;
-                    }
-                    return showFlag;
-                }).collect(Collectors.toList());
+                fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(StringUtils.valueOf(e.getIsQuery()))).collect(Collectors.toList());
                 if(CutEnum.CN.getValue().equals(cut)){
                     fieldList = fieldList.stream().filter(e->!"title_en".equals(e.getDbFieldName())).collect(Collectors.toList());
                 }else{
@@ -3637,8 +3631,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                 }
                                 conditionSb.append(" and " + key + " like concat(concat('%','" + value + "'),'%') ESCAPE '/'");
 //                                conditionSb.append(" and " + key + " like concat(concat('%','" + value + "'),'%')");
-                            } else if (StringUtils.equals(fieldName,"id")){
-                                conditionSb.append(" and " + key + " ='" + value + "'");
                             }
                         }
                     }