From a5a71ebd864456e34fa1250a8c8ea1a907abcda8 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 6 Jul 2022 09:52:55 +0800
Subject: [PATCH 01/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/CollectionType/index.vue   | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index 74052d9b3..635d03811 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -28,7 +28,7 @@
               <a-input class="box-input inputWid"
                        :disabled="item.isLock == '1' ? true: false"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
-                       onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
+                       @input="onInput"
                        onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
                        v-model="item.dataValue"/>
             </div>
@@ -182,7 +182,7 @@
                        :maxLength="1000"
                        :disabled="item.isLock == '1' ? true: false"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
-                       onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
+                       @input="onInput"
                        onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
                        v-model="item.dataValue"/>
             </div>
@@ -276,7 +276,7 @@
             <div v-else-if="item.controlVerify == '2'">
               <a-input class="box-input inputWid"
                        :maxLength="1000"
-                       onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
+                       @input="onInput"
                        onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
                        :disabled="item.isLock == '1' ? true: false"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
@@ -385,7 +385,7 @@
               <a-input class="box-input inputWid"
                        :maxLength="1000"
                        :disabled="item.isLock == '1' ? true: false"
-                       onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
+                       @input="onInput"
                        onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
                        v-model="item.dataValue"/>
@@ -549,7 +549,7 @@
                        :disabled="item.isLock == '1' ? true: false"
                        :maxLength="1000"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
-                       onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
+                       @input="onInput"
                        onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
                        v-model="item.dataValue"/>
             </div>
@@ -663,6 +663,15 @@
       })
     },
     methods: {
+      onInput(r) {
+        let value = r.target.value
+        r.target.value = value.replace(/[^\u4e00-\u9fa5]/g, '')
+        this.detailDate.list.forEach((item) => {
+          if (item.controlVerify == '2') {
+            item.dataValue = r.target.value
+          }
+        })
+      },
       uploadSuccess(data) {
         let attIdList = []
         if (data && data.length > 0) {
@@ -732,10 +741,11 @@
 
   .selectWid .ant-select-selection {
     height: 38px !important;
-    line-height: 38px!important;
+    line-height: 38px !important;
   }
+
   .selectWid .ant-select-selection__rendered {
-    line-height: 36px!important;
+    line-height: 36px !important;
   }
 </style>
 <style lang="less" scoped>

From cd7434da1e08aa1c0bfd403938c47f56555aaf45 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 6 Jul 2022 13:47:16 +0800
Subject: [PATCH 02/25] =?UTF-8?q?=E9=A2=84=E6=8A=A5=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java
index 1205023c3..02ba9a702 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java
@@ -141,8 +141,16 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl<Law
 						return String.valueOf(p1.getSort()).compareTo(String.valueOf(p2.getSort()));
 					}
 				});
+				for (LawsMonthlyReportTitleTemplateEO child : children) {
+					if(child.getChildren().size() == 0){
+						child.setChildren(null);
+					}
+				}
 				lawsMonthlyReportTitleTemplateEO.setChildren(children);
 			}
+			else{
+				lawsMonthlyReportTitleTemplateEO.setChildren(null);
+			}
 		}
 		Page pages = getPages(pageNo, pageSize, parentList);
 		return pages;

From bcd606369395aa1415ceb34a8eab88d4a3509142 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 6 Jul 2022 13:48:11 +0800
Subject: [PATCH 03/25] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=94=B6=E9=9B=86?=
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/initiatingProcess.vue          | 146 +++++++++++++++---
 .../collectionOfRegulatoryOpinions/index.vue  |   2 +-
 4 files changed, 126 insertions(+), 24 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 94e5642a8..ebd5a051d 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1088,4 +1088,5 @@ module.exports = {
   defaultTemplate:'Default template',
   newRequestCommentListTemplate:'New request for comment list template',
   NewReleasedStandardTemplate:'New released standard template',
+  pleaseSelectStandard:'Please select a standard',
 }
\ 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 a2ceb2707..fa467d5f5 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1092,4 +1092,5 @@ module.exports = {
   defaultTemplate:'默认模板',
   newRequestCommentListTemplate:'新征求意见清单模板',
   NewReleasedStandardTemplate:'新发布标准模板',
+  pleaseSelectStandard:'请选择标准',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
index 2634e0991..a0c3d8489 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
@@ -18,7 +18,7 @@
           :scroll="{x: '100%'}"
           rowKey="id"
           :data-source="dataSource"
-          :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+          :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange ,columnTitle:' '}"
           :columns="columns"
         >
         </a-table>
@@ -26,7 +26,6 @@
           <a-pagination
             :show-total="total => $t('total')+` ${total} `+$t('strip')"
             show-quick-jumper
-            show-size-changer
             :page-size.sync="pageSize"
             :total="total"
             :current="pageNo"
@@ -42,13 +41,13 @@
                   <span class="Required">*</span>
                   <span class="title-text-text" :title="$t('closingDate')">{{$t('closingDate')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="closingDate">
+                <a-form-model-item class="itemModel" prop="endTime">
                   <a-date-picker class="box-input"
                                  :placeholder="$t('PleaseSelect')+$t('closingDate')"
-                                 @change="dateChange('closingDate')"
+                                 @change="dateChange('endTime')"
                                  :getCalendarContainer="(trigger) => trigger.parentNode"
                                  format="YYYY-MM-DD"
-                                 v-model="formInline['closingDate']"
+                                 v-model="formInline['endTime']"
                                  style="width: 100%"/>
                 </a-form-model-item>
               </div>
@@ -59,14 +58,13 @@
                   <span class="Required">*</span>
                   <span class="title-text-text" :title="$t('Assessor')">{{$t('Assessor')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="dreUserIdName">
+                <a-form-model-item class="itemModel" prop="evaluatorIdsName">
                   <PersonnelSelection class="box-input"
                                       :personneQuery="formInline"
-                                      :query="{db_field_name:'dreUserId',db_field_txt:$t('Assessor')}"
+                                      :query="{db_field_name:'evaluatorIds',db_field_txt:$t('Assessor')}"
                                       :isInput="true"
-                                      :isSingleChoice="true"
                                       @change="PersonnelSelectionChange"
-                                      v-model="formInline.dreUserIdName"/>
+                                      v-model="formInline.evaluatorIdsName"/>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -77,9 +75,9 @@
                 <div class="title-text">
                   <span class="title-text-text" :title="$t('taskDescription')">{{$t('taskDescription')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="standard">
+                <a-form-model-item class="itemModel" prop="taskExplain">
                   <a-textarea :placeholder="$t('pleaseEnter')+$t('taskDescription')"
-                              v-model="formInline.approvalOpinion"
+                              v-model="formInline.taskExplain"
                               :rows="4"/>
                 </a-form-model-item>
               </div>
@@ -91,11 +89,11 @@
                 <div class="title-text">
                   <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="approvalFile">
+                <a-form-model-item class="itemModel" prop="accessory_id">
                   <a-button type="primary" class="button-text"
-                            @click="clickButtonToUpload('approvalFile')">
-                    {{ (formInline.approvalFile === 'null' || formInline.approvalFile === '' ||
-                    formInline.approvalFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                            @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>
@@ -121,6 +119,8 @@
   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: 'initiatingProcess',
@@ -136,7 +136,8 @@
         title: this.$t('regulatoryEngineer') + this.$t('initiatingProcess'),
         //url传参严格按照当前命名
         url: {
-          seachList: 'document/bussDocumentLibraryEO/queryCondition'   //搜索字段
+          seachList: 'document/bussDocumentLibraryEO/queryCondition',   //搜索字段
+          addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy'
         },
         loading: false,
         dataSource: [],
@@ -145,7 +146,24 @@
         pageSize: 10,
         pageNo: 1,
         formInline: {},
-        rules: {},
+        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'),
@@ -187,16 +205,27 @@
             align: 'center',
             ellipsis: true,
             width: 170,
-            dataIndex: 'technology_territory'
-          },
+            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()
@@ -207,13 +236,31 @@
         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) {
+      onSelectChange(value, record) {
         this.selectedRowKeys = value
         if (this.selectedRowKeys.length > 1) {
-          this.selectedRowKeys.unshift()
+          this.selectedRowKeys.shift()
+          record.shift()
         }
+        this.selectedRowKeysRecord = record
       },
       clickButtonToUpload(item) {
         this.$refs.uploadFile.perentHandleFunc()
@@ -247,7 +294,60 @@
         this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : ''
       },
       submit() {
-
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length == 0) {
+              this.$message.warning(this.$t('pleaseSelectStandard'))
+            } else {
+              let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0])
+              value.standId = value.id
+              delete value.id
+              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)
+          }
+        })
+      },
+      completeTask(value, taskId) {
+        let operatorTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        value.operatorTime = operatorTime
+        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.loading = false
+            this.$router.push({
+              path: '/collectionOfRegulatoryOpinions'
+            })
+          } else {
+            this.loading = false
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
       }
     }
   }
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
index 9d54df13b..09e85fbb2 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
@@ -143,7 +143,7 @@
             align: 'center',
             width: 170,
             ellipsis: true,
-            dataIndex: 'gatherResult'
+            dataIndex: 'gatherResultShow'
           },
           {
             title: this.$t('dateOfInitiation'),

From 569c261fd2d6097dedce39e2efa31cae37dbe682 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Wed, 6 Jul 2022 14:11:41 +0800
Subject: [PATCH 04/25] =?UTF-8?q?=E6=B7=BB=E5=8A=A0sql=E8=AE=B0=E5=BD=95-?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index e6adde55f..99c645c91 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -117,4 +117,59 @@ CREATE TABLE `params_collect_manifest_user_type_log` (
      PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
--- 以上部分2022年7月2日已更新至正式环境
\ No newline at end of file
+-- 以上部分2022年7月2日已更新至正式环境
+
+-- 认证模块菜单权限
+SET FOREIGN_KEY_CHECKS = 0;
+
+INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1541614812204711937', '1536593381830782978', '添加清单', NULL, NULL, NULL, NULL, 2, 'params:manifest:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-06-28 10:49:48', NULL, NULL, 0, 0, '1', 0, 'Add Manifest');
+
+INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1541615032762187777', '1536593381830782978', '变更扩展', NULL, NULL, NULL, NULL, 2, 'params:manifest:change', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-06-28 10:50:40', NULL, NULL, 0, 0, '1', 0, 'Change Extension');
+
+INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1541615202417590273', '1536593381830782978', '复制参数清单', NULL, NULL, NULL, NULL, 2, 'params:manifest:copy', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-06-28 10:51:21', NULL, NULL, 0, 0, '1', 0, 'Copy');
+
+INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1541615399201751041', '1536593381830782978', '批量删除', NULL, NULL, NULL, NULL, 2, 'params:manifest:deleteBatch', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-06-28 10:52:08', NULL, NULL, 0, 0, '1', 0, 'Batch Delete');
+
+INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1541615599395880962', '1536593381830782978', '配置', NULL, NULL, NULL, NULL, 2, 'params:config:list', '1', 1.00, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2022-06-28 10:52:55', NULL, NULL, 0, 0, '1', 0, 'Config');
+
+INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1541615902719557634', '1541615599395880962', '添加配置', NULL, NULL, NULL, NULL, 2, 'params:config:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-06-28 10:54:08', 'admin', '2022-07-02 10:22:28', 0, 0, '1', 0, 'Add Config');
+
+INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1541616014690697217', '1541615599395880962', '删除配置', NULL, NULL, NULL, NULL, 2, 'params:config:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-06-28 10:54:34', 'admin', '2022-07-02 10:22:51', 0, 0, '1', 0, 'Delete Config');
+
+INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1541616135687979009', '1541615599395880962', '提交', NULL, NULL, NULL, NULL, 2, 'params:config:addBatch', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-06-28 10:55:03', NULL, NULL, 0, 0, '1', 0, 'Submit');
+
+INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1541616271113666562', '1536593381830782978', '编辑', NULL, NULL, NULL, NULL, 2, 'params:manifest:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-06-28 10:55:36', NULL, NULL, 0, 0, '1', 0, 'Edit');
+
+INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1541616380576612353', '1536593381830782978', '删除', NULL, NULL, NULL, NULL, 2, 'params:manifest:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-06-28 10:56:02', NULL, NULL, 0, 0, '1', 0, 'Delete');
+
+INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1541616583316684802', '1536593381830782978', '历史版本', NULL, NULL, NULL, NULL, 2, 'params:manifest:history', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-06-28 10:56:50', NULL, NULL, 0, 0, '1', 0, 'History Version');
+
+UPDATE `laws_weilai`.`sys_permission` SET `parent_id` = '1516964175944798210', `name` = '参数模板管理', `url` = '/ParameterTemplate', `component` = 'parameter/ParameterTemplate/index', `component_name` = NULL, `redirect` = NULL, `menu_type` = 1, `perms` = 'params:template:page', `perms_type` = '1', `sort_no` = 1.00, `always_show` = 0, `icon` = NULL, `is_route` = 1, `is_leaf` = 0, `keep_alive` = 0, `hidden` = 0, `description` = NULL, `create_by` = 'admin', `create_time` = '2022-04-21 10:27:11', `update_by` = 'admin', `update_time` = '2022-06-22 09:51:26', `del_flag` = 0, `rule_flag` = 0, `status` = '1', `internal_or_external` = 0, `menu_en` = 'Parameter Template' WHERE `id` = '1516966747216728066';
+
+UPDATE `laws_weilai`.`sys_permission` SET `parent_id` = '1514541055125291010', `name` = '认证参数列表', `url` = NULL, `component` = NULL, `component_name` = NULL, `redirect` = NULL, `menu_type` = 2, `perms` = 'params:manifest:page', `perms_type` = '1', `sort_no` = 1.00, `always_show` = 0, `icon` = NULL, `is_route` = 1, `is_leaf` = 0, `keep_alive` = 0, `hidden` = 0, `description` = NULL, `create_by` = 'shanshan.su', `create_time` = '2022-06-14 14:16:25', `update_by` = 'admin', `update_time` = '2022-07-02 10:32:31', `del_flag` = 0, `rule_flag` = 0, `status` = '1', `internal_or_external` = 0, `menu_en` = 'Task parameter collection' WHERE `id` = '1536593381830782978';
+
+SET FOREIGN_KEY_CHECKS = 1;
+-- 以上部分2022年7月6日已更新至正式环境
+
+-- 参数项收集清单字段信息修改
+SET FOREIGN_KEY_CHECKS = 0;
+
+UPDATE `laws_weilai`.`onl_cgform_field` SET `cgform_head_id` = '9ca1773d2a484d2fadae38491ad51aa1', `db_field_name` = 'description', `db_field_en_name` = 'Description', `db_field_txt` = '参数说明', `order_num` = 13, `db_field_name_old` = NULL, `db_is_key` = 0, `db_is_null` = 1, `db_type` = 'string', `db_length` = 200, `db_point_length` = 0, `db_default_val` = '', `dict_field` = '', `dict_table` = '', `dict_text` = '', `field_show_type` = 'text', `field_href` = '', `field_length` = 120, `field_valid_type` = NULL, `field_must_input` = '0', `field_extend_json` = '', `field_default_value` = '', `is_query` = 0, `is_show_form` = 0, `is_show_list` = 1, `is_read_only` = 0, `query_mode` = 'single', `main_table` = '', `main_field` = '', `update_by` = 'admin', `update_time` = '2022-06-28 09:36:09', `create_time` = '2022-05-05 14:54:45', `create_by` = 'admin', `converter` = '', `query_def_val` = '', `query_dict_text` = '', `query_dict_field` = '', `query_dict_table` = '', `query_show_type` = 'text', `query_config_flag` = '0', `query_valid_type` = NULL, `query_must_input` = NULL, `sort_flag` = '0', `show_area` = NULL, `is_show_laws_list` = NULL, `is_show_search` = NULL, `is_delete` = 0, `is_model` = '7', `dict_id` = NULL WHERE `id` = '2a6b10cce459f27170695bab1265c94a';
+
+UPDATE `laws_weilai`.`onl_cgform_field` SET `cgform_head_id` = '9ca1773d2a484d2fadae38491ad51aa1', `db_field_name` = 'sdt', `db_field_en_name` = 'Sdt', `db_field_txt` = '工程接口人', `order_num` = 21, `db_field_name_old` = NULL, `db_is_key` = 0, `db_is_null` = 1, `db_type` = 'string', `db_length` = 50, `db_point_length` = 0, `db_default_val` = '', `dict_field` = '', `dict_table` = '', `dict_text` = '', `field_show_type` = 'text', `field_href` = '', `field_length` = 120, `field_valid_type` = NULL, `field_must_input` = '0', `field_extend_json` = '', `field_default_value` = '', `is_query` = 0, `is_show_form` = 0, `is_show_list` = 1, `is_read_only` = 0, `query_mode` = 'single', `main_table` = '', `main_field` = '', `update_by` = 'admin', `update_time` = '2022-06-28 09:36:09', `create_time` = '2022-05-05 14:54:45', `create_by` = 'admin', `converter` = '', `query_def_val` = '', `query_dict_text` = '', `query_dict_field` = '', `query_dict_table` = '', `query_show_type` = 'text', `query_config_flag` = '0', `query_valid_type` = NULL, `query_must_input` = NULL, `sort_flag` = '0', `show_area` = NULL, `is_show_laws_list` = NULL, `is_show_search` = NULL, `is_delete` = 0, `is_model` = '7', `dict_id` = NULL WHERE `id` = '58c3d5a50c86be19d5ab0cd5ac4d6d8b';
+
+UPDATE `laws_weilai`.`onl_cgform_field` SET `cgform_head_id` = '9ca1773d2a484d2fadae38491ad51aa1', `db_field_name` = 'deadline', `db_field_en_name` = 'Deadline', `db_field_txt` = '截止时间', `order_num` = 23, `db_field_name_old` = NULL, `db_is_key` = 0, `db_is_null` = 1, `db_type` = 'Date', `db_length` = 0, `db_point_length` = 0, `db_default_val` = '', `dict_field` = '', `dict_table` = '', `dict_text` = '', `field_show_type` = 'date', `field_href` = '', `field_length` = 120, `field_valid_type` = NULL, `field_must_input` = '0', `field_extend_json` = '', `field_default_value` = '', `is_query` = 0, `is_show_form` = 0, `is_show_list` = 1, `is_read_only` = 0, `query_mode` = 'single', `main_table` = '', `main_field` = '', `update_by` = 'admin', `update_time` = '2022-06-28 09:36:09', `create_time` = '2022-05-05 14:54:45', `create_by` = 'admin', `converter` = '', `query_def_val` = '', `query_dict_text` = '', `query_dict_field` = '', `query_dict_table` = '', `query_show_type` = 'text', `query_config_flag` = '0', `query_valid_type` = NULL, `query_must_input` = NULL, `sort_flag` = '0', `show_area` = NULL, `is_show_laws_list` = NULL, `is_show_search` = NULL, `is_delete` = 0, `is_model` = '7', `dict_id` = NULL WHERE `id` = '7b8ece563b5403adfb3ea0378c896dcd';
+
+UPDATE `laws_weilai`.`onl_cgform_field` SET `cgform_head_id` = '9ca1773d2a484d2fadae38491ad51aa1', `db_field_name` = 'cert_category', `db_field_en_name` = 'Cert Category', `db_field_txt` = '认证类别', `order_num` = 9, `db_field_name_old` = NULL, `db_is_key` = 0, `db_is_null` = 1, `db_type` = 'string', `db_length` = 1000, `db_point_length` = 0, `db_default_val` = '', `dict_field` = '', `dict_table` = '', `dict_text` = '', `field_show_type` = 'text', `field_href` = '', `field_length` = 120, `field_valid_type` = NULL, `field_must_input` = '0', `field_extend_json` = '', `field_default_value` = '', `is_query` = 0, `is_show_form` = 0, `is_show_list` = 1, `is_read_only` = 0, `query_mode` = 'single', `main_table` = '', `main_field` = '', `update_by` = 'admin', `update_time` = '2022-06-28 09:36:09', `create_time` = '2022-05-05 14:54:45', `create_by` = 'admin', `converter` = '', `query_def_val` = '', `query_dict_text` = '', `query_dict_field` = '', `query_dict_table` = '', `query_show_type` = 'text', `query_config_flag` = '0', `query_valid_type` = NULL, `query_must_input` = NULL, `sort_flag` = '0', `show_area` = NULL, `is_show_laws_list` = NULL, `is_show_search` = NULL, `is_delete` = 0, `is_model` = '7', `dict_id` = NULL WHERE `id` = '7b8ef9f8da124ed93e5c10a14b903390';
+
+UPDATE `laws_weilai`.`onl_cgform_field` SET `cgform_head_id` = '9ca1773d2a484d2fadae38491ad51aa1', `db_field_name` = 'state', `db_field_en_name` = 'State', `db_field_txt` = '状态', `order_num` = 19, `db_field_name_old` = NULL, `db_is_key` = 0, `db_is_null` = 1, `db_type` = 'string', `db_length` = 50, `db_point_length` = 0, `db_default_val` = '', `dict_field` = '', `dict_table` = '', `dict_text` = '', `field_show_type` = 'text', `field_href` = '', `field_length` = 120, `field_valid_type` = NULL, `field_must_input` = '0', `field_extend_json` = '', `field_default_value` = '', `is_query` = 0, `is_show_form` = 0, `is_show_list` = 1, `is_read_only` = 0, `query_mode` = 'single', `main_table` = '', `main_field` = '', `update_by` = 'admin', `update_time` = '2022-06-28 09:36:09', `create_time` = '2022-05-05 14:54:45', `create_by` = 'admin', `converter` = '', `query_def_val` = '', `query_dict_text` = '', `query_dict_field` = '', `query_dict_table` = '', `query_show_type` = 'text', `query_config_flag` = '0', `query_valid_type` = NULL, `query_must_input` = NULL, `sort_flag` = '0', `show_area` = NULL, `is_show_laws_list` = NULL, `is_show_search` = NULL, `is_delete` = 0, `is_model` = '7', `dict_id` = NULL WHERE `id` = '9050dc65a7b2fe82927b74a9ef4a4bb4';
+
+UPDATE `laws_weilai`.`onl_cgform_field` SET `cgform_head_id` = '9ca1773d2a484d2fadae38491ad51aa1', `db_field_name` = 'dre', `db_field_en_name` = 'Dre', `db_field_txt` = '填写人', `order_num` = 22, `db_field_name_old` = NULL, `db_is_key` = 0, `db_is_null` = 1, `db_type` = 'string', `db_length` = 50, `db_point_length` = 0, `db_default_val` = '', `dict_field` = '', `dict_table` = '', `dict_text` = '', `field_show_type` = 'text', `field_href` = '', `field_length` = 120, `field_valid_type` = NULL, `field_must_input` = '0', `field_extend_json` = '', `field_default_value` = '', `is_query` = 0, `is_show_form` = 0, `is_show_list` = 1, `is_read_only` = 0, `query_mode` = 'single', `main_table` = '', `main_field` = '', `update_by` = 'admin', `update_time` = '2022-06-28 09:36:09', `create_time` = '2022-05-05 14:54:45', `create_by` = 'admin', `converter` = '', `query_def_val` = '', `query_dict_text` = '', `query_dict_field` = '', `query_dict_table` = '', `query_show_type` = 'text', `query_config_flag` = '0', `query_valid_type` = NULL, `query_must_input` = NULL, `sort_flag` = '0', `show_area` = NULL, `is_show_laws_list` = NULL, `is_show_search` = NULL, `is_delete` = 0, `is_model` = '7', `dict_id` = NULL WHERE `id` = 'a371f6d49781c0921a48f317d1ba69b6';
+
+UPDATE `laws_weilai`.`onl_cgform_field` SET `cgform_head_id` = '9ca1773d2a484d2fadae38491ad51aa1', `db_field_name` = 'params_name', `db_field_en_name` = 'Params Name', `db_field_txt` = '参数名称', `order_num` = 10, `db_field_name_old` = NULL, `db_is_key` = 0, `db_is_null` = 1, `db_type` = 'string', `db_length` = 30, `db_point_length` = 0, `db_default_val` = '', `dict_field` = '', `dict_table` = '', `dict_text` = '', `field_show_type` = 'text', `field_href` = '', `field_length` = 120, `field_valid_type` = NULL, `field_must_input` = '0', `field_extend_json` = '', `field_default_value` = '', `is_query` = 0, `is_show_form` = 0, `is_show_list` = 1, `is_read_only` = 0, `query_mode` = 'single', `main_table` = '', `main_field` = '', `update_by` = 'admin', `update_time` = '2022-06-28 09:36:09', `create_time` = '2022-05-05 14:54:45', `create_by` = 'admin', `converter` = '', `query_def_val` = '', `query_dict_text` = '', `query_dict_field` = '', `query_dict_table` = '', `query_show_type` = 'text', `query_config_flag` = '0', `query_valid_type` = NULL, `query_must_input` = NULL, `sort_flag` = '0', `show_area` = NULL, `is_show_laws_list` = NULL, `is_show_search` = NULL, `is_delete` = 0, `is_model` = '7', `dict_id` = NULL WHERE `id` = 'e586bd87d4d826ce3d7d373caf54c6f6';
+
+UPDATE `laws_weilai`.`onl_cgform_field` SET `cgform_head_id` = '9ca1773d2a484d2fadae38491ad51aa1', `db_field_name` = 'duty_territory', `db_field_en_name` = 'Duty territory', `db_field_txt` = '责任领域', `order_num` = 20, `db_field_name_old` = NULL, `db_is_key` = 0, `db_is_null` = 1, `db_type` = 'string', `db_length` = 50, `db_point_length` = 0, `db_default_val` = '', `dict_field` = '', `dict_table` = '', `dict_text` = '', `field_show_type` = 'text', `field_href` = '', `field_length` = 120, `field_valid_type` = NULL, `field_must_input` = '0', `field_extend_json` = '', `field_default_value` = '', `is_query` = 0, `is_show_form` = 0, `is_show_list` = 1, `is_read_only` = 0, `query_mode` = 'single', `main_table` = '', `main_field` = '', `update_by` = 'admin', `update_time` = '2022-06-28 09:36:09', `create_time` = '2022-05-05 14:54:45', `create_by` = 'admin', `converter` = '', `query_def_val` = '', `query_dict_text` = '', `query_dict_field` = '', `query_dict_table` = '', `query_show_type` = 'text', `query_config_flag` = '0', `query_valid_type` = NULL, `query_must_input` = NULL, `sort_flag` = '0', `show_area` = NULL, `is_show_laws_list` = NULL, `is_show_search` = NULL, `is_delete` = 0, `is_model` = '7', `dict_id` = NULL WHERE `id` = 'ed57f77975218560b37ea497a20109c6';
+
+UPDATE `laws_weilai`.`onl_cgform_field` SET `cgform_head_id` = '9ca1773d2a484d2fadae38491ad51aa1', `db_field_name` = 'nio_number', `db_field_en_name` = 'NIO Number', `db_field_txt` = 'NIO编号', `order_num` = 7, `db_field_name_old` = NULL, `db_is_key` = 0, `db_is_null` = 1, `db_type` = 'string', `db_length` = 15, `db_point_length` = 0, `db_default_val` = '', `dict_field` = '', `dict_table` = '', `dict_text` = '', `field_show_type` = 'text', `field_href` = '', `field_length` = 120, `field_valid_type` = NULL, `field_must_input` = '0', `field_extend_json` = '', `field_default_value` = '', `is_query` = 0, `is_show_form` = 0, `is_show_list` = 1, `is_read_only` = 0, `query_mode` = 'single', `main_table` = '', `main_field` = '', `update_by` = 'admin', `update_time` = '2022-06-28 09:36:09', `create_time` = '2022-05-05 14:54:45', `create_by` = 'admin', `converter` = '', `query_def_val` = '', `query_dict_text` = '', `query_dict_field` = '', `query_dict_table` = '', `query_show_type` = 'text', `query_config_flag` = '0', `query_valid_type` = NULL, `query_must_input` = NULL, `sort_flag` = '0', `show_area` = NULL, `is_show_laws_list` = NULL, `is_show_search` = NULL, `is_delete` = 0, `is_model` = '7', `dict_id` = NULL WHERE `id` = 'fadb1e8609593c3a5ea3cda4f0f97464';
+
+SET FOREIGN_KEY_CHECKS = 1;

From cfdb75eda7e0d6480fd064cee343d8109a849701 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Wed, 6 Jul 2022 14:21:34 +0800
Subject: [PATCH 05/25] =?UTF-8?q?=E6=B7=BB=E5=8A=A0sql=E8=AE=B0=E5=BD=95-?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=A8=A1=E5=9D=97?=
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, 4 insertions(+)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 99c645c91..b61270de9 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -173,3 +173,7 @@ UPDATE `laws_weilai`.`onl_cgform_field` SET `cgform_head_id` = '9ca1773d2a484d2f
 UPDATE `laws_weilai`.`onl_cgform_field` SET `cgform_head_id` = '9ca1773d2a484d2fadae38491ad51aa1', `db_field_name` = 'nio_number', `db_field_en_name` = 'NIO Number', `db_field_txt` = 'NIO编号', `order_num` = 7, `db_field_name_old` = NULL, `db_is_key` = 0, `db_is_null` = 1, `db_type` = 'string', `db_length` = 15, `db_point_length` = 0, `db_default_val` = '', `dict_field` = '', `dict_table` = '', `dict_text` = '', `field_show_type` = 'text', `field_href` = '', `field_length` = 120, `field_valid_type` = NULL, `field_must_input` = '0', `field_extend_json` = '', `field_default_value` = '', `is_query` = 0, `is_show_form` = 0, `is_show_list` = 1, `is_read_only` = 0, `query_mode` = 'single', `main_table` = '', `main_field` = '', `update_by` = 'admin', `update_time` = '2022-06-28 09:36:09', `create_time` = '2022-05-05 14:54:45', `create_by` = 'admin', `converter` = '', `query_def_val` = '', `query_dict_text` = '', `query_dict_field` = '', `query_dict_table` = '', `query_show_type` = 'text', `query_config_flag` = '0', `query_valid_type` = NULL, `query_must_input` = NULL, `sort_flag` = '0', `show_area` = NULL, `is_show_laws_list` = NULL, `is_show_search` = NULL, `is_delete` = 0, `is_model` = '7', `dict_id` = NULL WHERE `id` = 'fadb1e8609593c3a5ea3cda4f0f97464';
 
 SET FOREIGN_KEY_CHECKS = 1;
+
+-- 上报库配置表添加字段
+ALTER TABLE `laws_weilai`.`params_report_config`
+    ADD COLUMN `old_params_config_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收集库参数配置id' AFTER `display_seq`;

From 000d46e4702e6c9465c2dc3e67c23f30de385154 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 6 Jul 2022 14:22:31 +0800
Subject: [PATCH 06/25] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86=EF=BC=8C=E5=88=97=E8=A1=A8=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E6=8A=80=E6=9C=AF=E9=A2=86=E5=9F=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/LawsOpinionGatherEO.java           |  3 ++
 .../impl/LawsOpinionGatherEOServiceImpl.java  | 44 +++++++++++++++++++
 2 files changed, 47 insertions(+)

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 f3bdee2c6..54bdb668d 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
@@ -73,6 +73,9 @@ public class LawsOpinionGatherEO implements Serializable {
 	@Excel(name = "技术领域", width = 15)
     @ApiModelProperty(value = "技术领域")
     private String technologyTerritory;
+	@TableField(exist = false)
+    /**技术领域展示字段*/
+    private String technologyTerritoryShow;
 
 	/**收集结果*/
 	@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 da95056f0..241da71dc 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
@@ -2,6 +2,7 @@ package com.jero.modules.lawsOpinionGather.service.impl;
 
 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.entity.LawsOpinionGatherEO;
 import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum;
@@ -9,11 +10,16 @@ import com.jero.modules.lawsOpinionGather.mapper.LawsOpinionGatherEOMapper;
 import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService;
 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.List;
 import java.util.Date;
+import java.util.stream.Collectors;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
@@ -25,6 +31,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGatherEOMapper, LawsOpinionGatherEO> implements ILawsOpinionGatherEOService {
 
+	@Autowired
+	private SysCategoryServiceImpl sysCategoryService;
+
 	/**
 	 * 保存
 	 *
@@ -130,11 +139,46 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
 	@Override
 	public void disposeData(List<LawsOpinionGatherEO> lawsOpinionGatherEOList,String cut) {
 		if(CollectionUtils.isNotEmpty(lawsOpinionGatherEOList)){
+			//树形数据字典
+			List<SysCategory> technologyTerritoryList = sysCategoryService.list();
 			lawsOpinionGatherEOList.forEach(lawsOpinionGather -> {
 				if(StringUtils.isNotEmpty(lawsOpinionGather.getGatherResult())){
 					lawsOpinionGather.setGatherResultShow(GatherResultEnum.getTextByValue(lawsOpinionGather.getGatherResult(),cut));
 				}
+				if(StringUtils.isNotEmpty(lawsOpinionGather.getTechnologyTerritory())){
+					String technologyTerritoryShow = disposeTechnologyTerritory(technologyTerritoryList, lawsOpinionGather.getTechnologyTerritory(), cut);
+					lawsOpinionGather.setTechnologyTerritoryShow(technologyTerritoryShow);
+				}
 			});
 		}
 	}
+
+	/**
+	 * 处理技术领域展示字段
+	 * @param technologyTerritoryList
+	 * @param technologyTerritory
+	 * @param cut
+	 * @return
+	 */
+	public String disposeTechnologyTerritory(List<SysCategory> technologyTerritoryList,String technologyTerritory,String cut){
+		String result = "";
+		//  technology_territory
+		if(StringUtils.isNotEmpty(technologyTerritory)){
+			StringBuilder sb = new StringBuilder();
+			for (String technologyTerritoryId : technologyTerritory.split(",")) {
+				List<SysCategory> collect = technologyTerritoryList.stream().filter(e -> e.getId().equals(technologyTerritoryId)).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()+",");
+					}
+				}
+			}
+			if(StringUtils.isNotEmpty(sb)){
+				result = sb.substring(0, sb.length() - 1);
+			}
+		}
+		return result;
+	}
 }

From b8ca777f585531525f1c86e98cca430c940e4be0 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 6 Jul 2022 14:26:32 +0800
Subject: [PATCH 07/25] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=20=20?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93/=E6=A0=87=E5=87=86id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql                | 5 +++++
 .../lawsOpinionGather/entity/LawsOpinionGatherEO.java        | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index b61270de9..fa6abf466 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -177,3 +177,8 @@ SET FOREIGN_KEY_CHECKS = 1;
 -- 上报库配置表添加字段
 ALTER TABLE `laws_weilai`.`params_report_config`
     ADD COLUMN `old_params_config_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收集库参数配置id' AFTER `display_seq`;
+
+
+-- 法规意见收集添加字段  文档库/标准id
+ALTER TABLE `laws_opinion_gather`
+    ADD COLUMN `stand_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/lawsOpinionGather/entity/LawsOpinionGatherEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java
index 54bdb668d..d21113dd0 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
@@ -103,4 +103,8 @@ public class LawsOpinionGatherEO implements Serializable {
     @ApiModelProperty(value = "流程实例id")
     private String actiProcInstId;
 
+    @Excel(name = "文档库/标准id", width = 15)
+    @ApiModelProperty(value = "文档库/标准id")
+    private String standId;
+
 }

From 8ca4478b3222c11f6e7c4db290e8c3b01cc2a103 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Wed, 6 Jul 2022 14:34:41 +0800
Subject: [PATCH 08/25] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E9=A3=9E=E4=B9=A6?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF-=E6=B7=BB=E5=8A=A0task=20type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ParamsCollectManifestEOServiceImpl.java        | 2 ++
 1 file changed, 2 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 91c88c0de..fecdef6f7 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
@@ -1240,6 +1240,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			feishuMsgVo.setTitle(MessageTypeEnum.HOMO_TASK.getName());
 			feishuMsgVo.setContent(content);
 			feishuMsgVo.setUrl(hrefFeishu);
+			feishuMsgVo.setTaskType(MessageTypeEnum.HOMO_TASK.getName());
 			feishuService.sendCardMsg(thirdIds, feishuMsgVo);
 		} catch (IOException e) {
 			log.error("飞书消息推送失败");
@@ -1312,6 +1313,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				feishuMsgVo.setTitle(MessageTypeEnum.HOMO_TASK.getName());
 				feishuMsgVo.setContent(content);
 				feishuMsgVo.setUrl(hrefFeishu);
+				feishuMsgVo.setTaskType(MessageTypeEnum.HOMO_TASK.getName());
 				feishuService.sendCardMsg(thirdIds, feishuMsgVo);
 			} catch (IOException e) {
 				log.error("飞书消息推送失败");

From 46835c4640dfab2b7caed877649545c706c98a83 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 6 Jul 2022 14:38:33 +0800
Subject: [PATCH 09/25] =?UTF-8?q?=E7=AB=A0=E8=8A=82=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...onthlyReportTitleTemplateEOController.java | 53 ++++++++-------
 .../LawsMonthlyReportTitleTemplateEO.java     |  1 -
 ...wsMonthlyReportTitleTemplateEOService.java | 16 +++--
 ...nthlyReportTitleTemplateEOServiceImpl.java | 65 +++++++++++++++++--
 .../vo/LawsMonthlyReportTitleTemplateVO.java  | 51 +++++++++++++++
 5 files changed, 146 insertions(+), 40 deletions(-)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/vo/LawsMonthlyReportTitleTemplateVO.java

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 b5ecaf9ed..db6a7d163 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,25 +1,30 @@
 package com.jero.modules.report.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
-import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
 import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO;
 import com.jero.modules.report.service.ILawsMonthlyReportTitleTemplateEOService;
-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 com.jero.modules.report.vo.LawsMonthlyReportTitleTemplateVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.jero.common.aspect.annotation.AutoLog;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+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.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
 
 
  /**
@@ -52,23 +57,21 @@ public class LawsMonthlyReportTitleTemplateEOController extends JeroController<L
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<LawsMonthlyReportTitleTemplateEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportTitleTemplateEO, req.getParameterMap());
-//		Page<LawsMonthlyReportTitleTemplateEO> page = new Page<LawsMonthlyReportTitleTemplateEO>(pageNo, pageSize);
-//		IPage<LawsMonthlyReportTitleTemplateEO> pageList = lawsMonthlyReportTitleTemplateEOService.page(page, queryWrapper);
-		IPage<LawsMonthlyReportTitleTemplateEO> pageList = lawsMonthlyReportTitleTemplateEOService.getPageInfo(pageNo,pageSize, queryWrapper);
-		return Result.OK(pageList);
+		List<LawsMonthlyReportTitleTemplateEO> pageList = lawsMonthlyReportTitleTemplateEOService.getPageInfo(lawsMonthlyReportTitleTemplateEO, req);
+		Page pages = lawsMonthlyReportTitleTemplateEOService.getPages(pageNo, pageSize, pageList);
+		return Result.OK(pages);
 	}
 
     /**
-	 * 列表查询
+	 * 章节目录
 	 *
 	 * @return
 	 */
-	@AutoLog(value = "月报标题模板-列表查询")
-    @ApiOperation(value="月报标题模板-列表查询", notes="月报标题模板-列表查询")
+	@AutoLog(value = "章节目录")
+    @ApiOperation(value="章节目录", notes="章节目录")
 	@GetMapping(value = "/list")
-	public Result<List<LawsMonthlyReportTitleTemplateEO>> queryList() {
-        List<LawsMonthlyReportTitleTemplateEO> list = lawsMonthlyReportTitleTemplateEOService.queryList();
+	public Result<List<LawsMonthlyReportTitleTemplateVO>> queryList(String cut) {
+        List<LawsMonthlyReportTitleTemplateVO> list = lawsMonthlyReportTitleTemplateEOService.queryList(cut);
         return Result.OK(list);
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java
index ab1b5a6c6..7b9888886 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java
@@ -81,5 +81,4 @@ public class LawsMonthlyReportTitleTemplateEO implements Serializable {
 
     //排序
     private int sort;
-
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java
index 51def4c31..6a2b744c1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java
@@ -1,10 +1,11 @@
 package com.jero.modules.report.service;
 
-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.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO;
+import com.jero.modules.report.vo.LawsMonthlyReportTitleTemplateVO;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -60,16 +61,15 @@ public interface ILawsMonthlyReportTitleTemplateEOService extends IService<LawsM
 	 *
 	 * @return
 	 */
-    List<LawsMonthlyReportTitleTemplateEO> queryList();
+    List<LawsMonthlyReportTitleTemplateVO> queryList(String cut);
 
 	/**
 	 * 分页
-	 * @param pageNo
-	 * @param pageSize
-	 * @param queryWrapper
+	 * @param lawsMonthlyReportTitleTemplateEO
 	 * @return
 	 */
-	IPage<LawsMonthlyReportTitleTemplateEO> getPageInfo(Integer pageNo,Integer pageSize, QueryWrapper<LawsMonthlyReportTitleTemplateEO> queryWrapper);
+	List<LawsMonthlyReportTitleTemplateEO> getPageInfo(LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO,
+														HttpServletRequest req);
 
 	/**
 	 * 一级菜单
@@ -81,4 +81,6 @@ public interface ILawsMonthlyReportTitleTemplateEOService extends IService<LawsM
 	 * @param lawsMonthlyReportTitleTemplateEOS
 	 */
 	void move(List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS);
+
+	Page getPages(Integer currentPage, Integer pageSize, List<LawsMonthlyReportTitleTemplateEO> list);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java
index 02ba9a702..151bfe9d2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java
@@ -2,15 +2,18 @@ package com.jero.modules.report.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO;
 import com.jero.modules.report.mapper.LawsMonthlyReportTitleTemplateEOMapper;
 import com.jero.modules.report.service.ILawsMonthlyReportTitleTemplateEOService;
+import com.jero.modules.report.vo.LawsMonthlyReportTitleTemplateVO;
 import com.jero.modules.system.util.StringUtils;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -115,13 +118,62 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl<Law
 	 * @return
 	 */
 	@Override
-    public List<LawsMonthlyReportTitleTemplateEO> queryList() {
-        return list();
+    public List<LawsMonthlyReportTitleTemplateVO> queryList(String cut) {
+		List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS = this.list();
+		//数据结构重组
+		List<LawsMonthlyReportTitleTemplateVO> lawsMonthlyReportTitleTemplateVOS = new ArrayList<>();
+		for (LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO : lawsMonthlyReportTitleTemplateEOS) {
+			LawsMonthlyReportTitleTemplateVO lawsMonthlyReportTitleTemplateVO = new LawsMonthlyReportTitleTemplateVO();
+			lawsMonthlyReportTitleTemplateVO.setId(lawsMonthlyReportTitleTemplateEO.getId());
+			lawsMonthlyReportTitleTemplateVO.setKey(lawsMonthlyReportTitleTemplateEO.getId());
+			lawsMonthlyReportTitleTemplateVO.setValue(lawsMonthlyReportTitleTemplateEO.getId());
+			lawsMonthlyReportTitleTemplateVO.setParentId(lawsMonthlyReportTitleTemplateEO.getParentId());
+			lawsMonthlyReportTitleTemplateVO.setSort(lawsMonthlyReportTitleTemplateEO.getSort());
+			if(CutEnum.CN.getValue().equals(cut)){
+				lawsMonthlyReportTitleTemplateVO.setTitle(lawsMonthlyReportTitleTemplateEO.getTitleCn());
+			}else{
+				lawsMonthlyReportTitleTemplateVO.setTitle(lawsMonthlyReportTitleTemplateEO.getTitleEn());
+			}
+			lawsMonthlyReportTitleTemplateVOS.add(lawsMonthlyReportTitleTemplateVO);
+		}
+
+		List<LawsMonthlyReportTitleTemplateVO> parentList = lawsMonthlyReportTitleTemplateVOS.stream()
+				.filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList());
+		Collections.sort(parentList, new Comparator<LawsMonthlyReportTitleTemplateVO>() {
+			@Override
+			public int compare(LawsMonthlyReportTitleTemplateVO p1, LawsMonthlyReportTitleTemplateVO p2) {
+				return String.valueOf(p1.getSort()).compareTo(String.valueOf(p2.getSort()));
+			}
+		});
+
+		for (LawsMonthlyReportTitleTemplateVO lawsMonthlyReportTitleTemplateVO : parentList) {
+			List<LawsMonthlyReportTitleTemplateVO> children = lawsMonthlyReportTitleTemplateVOS.stream()
+					.filter(e -> lawsMonthlyReportTitleTemplateVO.getId().equals(e.getParentId())).collect(Collectors.toList());
+			if(children.size() != 0){
+				Collections.sort(children, new Comparator<LawsMonthlyReportTitleTemplateVO>() {
+					@Override
+					public int compare(LawsMonthlyReportTitleTemplateVO p1, LawsMonthlyReportTitleTemplateVO p2) {
+						return String.valueOf(p1.getSort()).compareTo(String.valueOf(p2.getSort()));
+					}
+				});
+				for (LawsMonthlyReportTitleTemplateVO child : children) {
+					if(child.getChildren().size() == 0){
+						child.setChildren(null);
+					}
+				}
+				lawsMonthlyReportTitleTemplateVO.setChildren(children);
+			}
+			else{
+				lawsMonthlyReportTitleTemplateVO.setChildren(null);
+			}
+		}
+		return parentList;
     }
 
 	@Override
-	public IPage<LawsMonthlyReportTitleTemplateEO> getPageInfo( Integer pageNo,Integer pageSize,QueryWrapper<LawsMonthlyReportTitleTemplateEO> queryWrapper) {
-		List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS = this.list();
+	public List<LawsMonthlyReportTitleTemplateEO> getPageInfo(LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEOTemp, HttpServletRequest req) {
+		QueryWrapper<LawsMonthlyReportTitleTemplateEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportTitleTemplateEOTemp, req.getParameterMap());
+		List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS = this.list(queryWrapper);
 		List<LawsMonthlyReportTitleTemplateEO> parentList = lawsMonthlyReportTitleTemplateEOS.stream()
 				.filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList());
 		Collections.sort(parentList, new Comparator<LawsMonthlyReportTitleTemplateEO>() {
@@ -152,8 +204,7 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl<Law
 				lawsMonthlyReportTitleTemplateEO.setChildren(null);
 			}
 		}
-		Page pages = getPages(pageNo, pageSize, parentList);
-		return pages;
+		return parentList;
 	}
 
 	/**
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/vo/LawsMonthlyReportTitleTemplateVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/vo/LawsMonthlyReportTitleTemplateVO.java
new file mode 100644
index 000000000..78219b883
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/vo/LawsMonthlyReportTitleTemplateVO.java
@@ -0,0 +1,51 @@
+package com.jero.modules.report.vo;
+
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * @Description: 月报标题模板
+ * @Author: jero-boot
+ * @Date:   2022-06-29
+ * @Version: V1.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class LawsMonthlyReportTitleTemplateVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    private String key;
+
+    private String value;
+
+    @ApiModelProperty(value = "父id")
+    private String parentId;
+
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+	private List<LawsMonthlyReportTitleTemplateVO> children = new ArrayList<>();
+
+	private int sort;
+
+
+}

From 24d45655da47705bbcb22bbfa2cb03791e7eddc9 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 6 Jul 2022 14:38:38 +0800
Subject: [PATCH 10/25] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=94=B6=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/modules/fillAdd.vue            |  11 +-
 .../src/views/dashboard/components/myList.vue |   6 +
 .../regulatoryCirculationHistory.vue          | 104 ++++++++++++++++++
 .../processForm/regulatoryProcess/index.vue   |  10 +-
 .../tabComponents/processCenter/index.vue     |   6 +
 5 files changed, 123 insertions(+), 14 deletions(-)
 create mode 100644 jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue

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 ec843792e..725066153 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
@@ -166,16 +166,9 @@
     },
     methods: {
       getTree() {
-        let query = {
-          pageNo: this.pageNo,
-          pageSize: 1000
-        }
-        getAction('/report/lawsMonthlyReportTitleTemplateEO/page', query).then((res) => {
+        getAction('/report/lawsMonthlyReportTitleTemplateEO/list', {}).then((res) => {
           if (res.success) {
-            this.chapterContentsList = res.result.records || []
-            this.chapterContentsList.forEach(res => {
-
-            })
+            this.chapterContentsList = res.result || []
           } else {
             this.chapterContentsList = []
           }
diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue
index 47a680c99..82e3f7663 100644
--- a/jero-web/src/views/dashboard/components/myList.vue
+++ b/jero-web/src/views/dashboard/components/myList.vue
@@ -94,6 +94,12 @@
             query: row
           })
           window.open(newUrl.href, '_blank')
+        } else if (row.prcType == '5') {
+          let newUrl = this.$router.resolve({
+            path: '/regulatoryProcessReview',
+            query: row
+          })
+          window.open(newUrl.href, '_blank')
         }
       }
     }
diff --git a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
new file mode 100644
index 000000000..3ece69515
--- /dev/null
+++ b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
@@ -0,0 +1,104 @@
+<template>
+  <div class="box">
+    <div class="box-text">
+      <div class="header-text">
+        {{$t('circulationHistory')}}
+      </div>
+    </div>
+    <div style="width: 100%">
+      <a-table
+        ref="table"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: true}"
+        :data-source="dataSource"
+        :columns="columns"
+      >
+      </a-table>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, downloadFile } from '@/api/manage'
+  import moment from 'moment'
+  import { Base64 } from 'js-base64'
+
+  export default {
+    name: 'regulatoryCirculationHistory',
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        columns: [
+          {
+            title: this.$t('operationContent'),
+            dataIndex: 'name',
+            align: 'center',
+            width: '20%'
+          },
+          {
+            title: this.$t('Operator'),
+            dataIndex: 'assignee',
+            align: 'center',
+            width: '20%'
+          },
+          {
+            title: this.$t('role'),
+            dataIndex: 'approvalOpinion',
+            align: 'center',
+            width: '20%'
+          },
+          {
+            title: this.$t('operationTime'),
+            dataIndex: 'createTime',
+            align: 'center',
+            width: '20%',
+            customRender: function(t, r, index) {
+              return moment(t).format('YYYY-MM-DD HH:mm:ss')
+            }
+          }
+        ]
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      getList() {
+        let query = {
+          actiProcInstId: this.$route.query.prcId,
+          flowType: '5'
+        }
+        getAction('/lawsOpinionGather/lawsProcessHistoryEO/list', query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result || []
+          } else {
+            this.dataSource = []
+          }
+
+        })
+      }
+    }
+  }
+</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;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
index 7c8e09c40..5f980019f 100644
--- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
@@ -32,7 +32,7 @@
 <script>
   import headerProcess from '../../components/headerProcess'
   import standardContent from '../../components/standardContent'
-  import circulationHistory from '../../components/taskCirculationHistory'
+  import circulationHistory from '../../components/regulatoryCirculationHistory'
   import footerProcess from '../../components/footerProcess'
   import feedbackInformation from '../../components/feedbackInformation'
 
@@ -63,21 +63,21 @@
           },
           {
             title: this.$t('regulatoryEngineer'),
-            value: 'regulatoryEngineer'
+            value: 'currentUserName'
           },
           {
             title: this.$t('closingDate'),
-            value: 'closingDate'
+            value: 'endTime'
           },
           {
             title: this.$t('enclosure'),
-            value: 'enclosure',
+            value: 'accessory_id',
             type: 2
           },
           {},
           {
             title: this.$t('taskDescription'),
-            value: 'taskDescription'
+            value: 'taskExplain'
           }
           // {
           //   title: this.$t('remarks'),
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 e2fc23025..0cf614453 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
@@ -161,6 +161,12 @@
             query: row
           })
           window.open(newUrl.href, '_blank')
+        } else if (row.prcType == '5') {
+          let newUrl = this.$router.resolve({
+            path: '/regulatoryProcessReview',
+            query: row
+          })
+          window.open(newUrl.href, '_blank')
         }
       },
       onChange(page, pageSize) {

From 5ae26a957d63d9219c4a96863f02160dcffc75b2 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 6 Jul 2022 15:05:47 +0800
Subject: [PATCH 11/25] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=94=B6=E9=9B=86?=
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/modules/fillAdd.vue            |  2 +-
 .../components/feedbackInformation.vue        | 26 +++++++++++++------
 .../tabComponents/alreadyProcess/index.vue    |  3 ++-
 .../tabComponents/alreadySend/index.vue       |  3 ++-
 .../tabComponents/monitorProcess/index.vue    |  3 ++-
 .../tabComponents/processCenter/index.vue     |  3 ++-
 8 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index ebd5a051d..276fdf7a4 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1013,6 +1013,7 @@ module.exports = {
   evaluationResults: 'Evaluation results',
   Assessor: 'Assessor',
   collectionOfRegulatoryOpinions: 'Collection Of Regulatory Opinions',
+  collectionOfRegulatoryOpinionsProcess: 'Collection Of Regulatory Opinions Process',
   feedbackInformation: 'Feedback Information',
   relevantSections: 'Relevant sections',
   questionsSuggestions: 'Questions or Suggestions',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index fa467d5f5..2dc448ef7 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 = {
   evaluationResults: '评估结果',
   Assessor:'评估人',
   collectionOfRegulatoryOpinions:'法规意见收集',
+  collectionOfRegulatoryOpinionsProcess:'法规意见收集流程',
   feedbackInformation:'反馈信息',
   relevantSections:'相关章节',
   questionsSuggestions:'问题/建议',
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 725066153..2258f7fb4 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
@@ -237,7 +237,7 @@
                 }
               })
               let query = Object.assign(val, {
-                month: formInline.month,
+                month: JSON.stringify(formInline.month),
                 memoriesChapter: formInline.memoriesChapter,
                 contentTemplate: formInline.contentTemplate
               })
diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue
index 959ff4f07..5e82f8b97 100644
--- a/jero-web/src/views/processCenter/components/feedbackInformation.vue
+++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue
@@ -29,7 +29,7 @@
                 <a-form-model-item class="itemModel" prop="relevantSections">
                   <a-input class="box-input"
                            :disabled="false"
-                           v-model="formInline.relevantSections"
+                           v-model="formInline.relatedSection"
                            :placeholder="$t('PleaseEnter')+$t('relevantSections')"/>
                 </a-form-model-item>
               </div>
@@ -44,7 +44,7 @@
                 <a-form-model-item class="itemModel" prop="questionsSuggestions">
                   <a-input class="box-input"
                            :disabled="false"
-                           v-model="formInline.questionsSuggestions"
+                           v-model="formInline.issueOrSuggest"
                            :placeholder="$t('PleaseEnter')+$t('questionsSuggestions')"/>
                 </a-form-model-item>
               </div>
@@ -69,11 +69,11 @@
                 <div class="title-text">
                   <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="approvalFile">
+                <a-form-model-item class="itemModel" prop="accessoryFile">
                   <a-button type="primary" class="button-text"
-                            @click="clickButtonToUpload('approvalFile')">
-                    {{ (formInline.approvalFile === 'null' || formInline.approvalFile === '' ||
-                    formInline.approvalFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                            @click="clickButtonToUpload('accessoryFile')">
+                    {{ (formInline.accessoryFile === 'null' || formInline.accessoryFile === '' ||
+                    formInline.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                     }}
                   </a-button>
                 </a-form-model-item>
@@ -105,7 +105,14 @@
       return {
         formInline: {},
         rules: {},
-        dataList: [{ id: 1 }]
+        dataList: [
+          {
+            relatedSection: '',
+            issueOrSuggest: '',
+            reason: '',
+            accessoryFile: ''
+          }
+        ]
       }
     },
     methods: {
@@ -135,7 +142,10 @@
       },
       addData() {
         this.dataList.push({
-          id: 2
+          relatedSection: '',
+          issueOrSuggest: '',
+          reason: '',
+          accessoryFile: ''
         })
         this.dataList = [...this.dataList]
       },
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 1cbc5affe..f50da247c 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue
@@ -50,7 +50,8 @@
         pageSize: 10,
         selectedRowKeys: [],
         prcTypeName: {
-          1: this.$t('taskConfirmationProcess')
+          1: this.$t('taskConfirmationProcess'),
+          5:this.$t('collectionOfRegulatoryOpinionsProcess')
         },
         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 b3904cdd1..28eab32a9 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue
@@ -51,7 +51,8 @@
         pageSize: 10,
         selectedRowKeys: [],
         prcTypeName: {
-          1: this.$t('taskConfirmationProcess')
+          1: this.$t('taskConfirmationProcess'),
+          5:this.$t('collectionOfRegulatoryOpinionsProcess')
         },
         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 9834b57db..47221a072 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue
@@ -51,7 +51,8 @@
         pageSize: 10,
         selectedRowKeys: [],
         prcTypeName: {
-          1: this.$t('taskConfirmationProcess')
+          1: this.$t('taskConfirmationProcess'),
+          5:this.$t('collectionOfRegulatoryOpinionsProcess')
         },
         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 0cf614453..e3981099f 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
@@ -49,7 +49,8 @@
         pageSize: 10,
         selectedRowKeys: [],
         prcTypeName: {
-          1: this.$t('taskConfirmationProcess')
+          1: this.$t('taskConfirmationProcess'),
+          5:this.$t('collectionOfRegulatoryOpinionsProcess')
         },
         columns: [
           {

From ab2e18b18a42abc493793ee874ae67b8aa83ee13 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 6 Jul 2022 15:22:14 +0800
Subject: [PATCH 12/25] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/LawsMonthlyReportWriteEO.java      | 15 +++--------
 .../report/entity/NewOpinionTemplateEO.java   |  5 +---
 .../report/entity/NewStandardTemplateEO.java  | 10 ++------
 .../LawsMonthlyReportWriteEOServiceImpl.java  | 25 +++++++++++++------
 4 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java
index 92462c36b..16af6ede5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java
@@ -128,25 +128,16 @@ public class LawsMonthlyReportWriteEO implements Serializable {
     private java.lang.String implementCar;
 
 	/**发布日期*/
-	@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 issueTime;
+    private java.lang.String issueTime;
 
 	/**新车型实施日期*/
-	@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 newCarImplementTime;
+    private java.lang.String newCarImplementTime;
 
 	/**在产车实施日期*/
-	@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 productionCarImplementTime;
+    private java.lang.String productionCarImplementTime;
 
 	/**主要内容中文*/
 	@Excel(name = "主要内容中文", width = 15)
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewOpinionTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewOpinionTemplateEO.java
index fcd2ec8d8..766d08c50 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewOpinionTemplateEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewOpinionTemplateEO.java
@@ -82,10 +82,7 @@ public class NewOpinionTemplateEO implements Serializable {
     private java.lang.String standardNameEn;
 
 	/**征求意见截止日期*/
-	@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 expirationDate;
+    private java.lang.String expirationDate;
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewStandardTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewStandardTemplateEO.java
index ca7363247..e680c4e80 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewStandardTemplateEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewStandardTemplateEO.java
@@ -82,17 +82,11 @@ public class NewStandardTemplateEO implements Serializable {
     private java.lang.String standardNameEn;
 
 	/**发布日期*/
-	@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 issueTime;
+    private java.lang.String issueTime;
 
 	/**实施日期*/
-	@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 implementTime;
+    private java.lang.String implementTime;
 
 }
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 2377af0f0..8906e352a 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
@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -235,23 +236,31 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 		List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOList = lawsMonthlyReportTitleTemplateEOService.list();
 
 		//新征求意见清单模板
-		LambdaQueryWrapper<NewOpinionTemplateEO> wrapper = new LambdaQueryWrapper<>();
-		wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList);
-		List<NewOpinionTemplateEO> newOpinionTemplateEOList = iNewOpinionTemplateEOService.list(wrapper);
+		List<NewOpinionTemplateEO> newOpinionTemplateEOList = new ArrayList<>();
+		if(lawsMonthlyReportIdList.size() != 0){
+			LambdaQueryWrapper<NewOpinionTemplateEO> wrapper = new LambdaQueryWrapper<>();
+			wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList);
+			newOpinionTemplateEOList = iNewOpinionTemplateEOService.list(wrapper);
+		}
+
 
 		//新发布标准清单模板
-		LambdaQueryWrapper<NewStandardTemplateEO> qrapperTemp = new LambdaQueryWrapper<>();
-		qrapperTemp.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList);
-		List<NewStandardTemplateEO> newStandardTemplateEOList = iNewStandardTemplateEOService.list(qrapperTemp);
+		List<NewStandardTemplateEO> newStandardTemplateEOList = new ArrayList<>();
+		if(lawsMonthlyReportIdList.size() != 0){
+			LambdaQueryWrapper<NewStandardTemplateEO> qrapperTemp = new LambdaQueryWrapper<>();
+			qrapperTemp.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList);
+			newStandardTemplateEOList = iNewStandardTemplateEOService.list(qrapperTemp);
+		}
+
 
 		for (LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO : pageInfo.getRecords()) {
 			//处理章节目录
 			if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getMemoriesChapter())){
 				List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream()
 						.filter(e -> lawsMonthlyReportWriteEO.getMemoriesChapter().equals(e.getId())).collect(Collectors.toList());
-				if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEO.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){
+				if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){
 					lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleCn());
-				}else if(CutEnum.EN.getValue().equals(lawsMonthlyReportWriteEO.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){
+				}else if(CutEnum.EN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){
 					lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleEn());
 				}
 			}

From 785476c50c3f4fe1e71fb59112d151fa61902a34 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 6 Jul 2022 15:48:09 +0800
Subject: [PATCH 13/25] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=94=B6=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/initiatingProcess.vue          | 10 ++++++
 .../components/feedbackInformation.vue        | 32 +++++++++--------
 .../processForm/regulatoryProcess/index.vue   | 34 ++++++++++++++++++-
 3 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
index a0c3d8489..83b65895a 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
@@ -293,6 +293,15 @@
       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) {
@@ -302,6 +311,7 @@
               let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0])
               value.standId = value.id
               delete value.id
+              value.id = this.getUUID()
               value.currentUserName = this.userInfo().username
               Object.keys(value).forEach(res => {
                 if (value[res] && value[res] instanceof String) {
diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue
index 5e82f8b97..559d8ce6f 100644
--- a/jero-web/src/views/processCenter/components/feedbackInformation.vue
+++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue
@@ -26,10 +26,10 @@
                   <span class="Required">*</span>
                   <span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="relevantSections">
+                <a-form-model-item class="itemModel" prop="relatedSection">
                   <a-input class="box-input"
-                           :disabled="false"
-                           v-model="formInline.relatedSection"
+                           :disabled="disabled"
+                           v-model="item.relatedSection"
                            :placeholder="$t('PleaseEnter')+$t('relevantSections')"/>
                 </a-form-model-item>
               </div>
@@ -41,10 +41,10 @@
                   <span class="title-text-text"
                         :title="$t('questionsSuggestions')">{{$t('questionsSuggestions')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="questionsSuggestions">
+                <a-form-model-item class="itemModel" prop="issueOrSuggest">
                   <a-input class="box-input"
-                           :disabled="false"
-                           v-model="formInline.issueOrSuggest"
+                           :disabled="disabled"
+                           v-model="item.issueOrSuggest"
                            :placeholder="$t('PleaseEnter')+$t('questionsSuggestions')"/>
                 </a-form-model-item>
               </div>
@@ -58,8 +58,8 @@
                 </div>
                 <a-form-model-item class="itemModel">
                   <a-input class="box-input"
-                           :disabled="false"
-                           v-model="formInline.reason"
+                           :disabled="disabled"
+                           v-model="item.reason"
                            :placeholder="$t('PleaseEnter')+$t('reason')"/>
                 </a-form-model-item>
               </div>
@@ -71,9 +71,9 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="accessoryFile">
                   <a-button type="primary" class="button-text"
-                            @click="clickButtonToUpload('accessoryFile')">
-                    {{ (formInline.accessoryFile === 'null' || formInline.accessoryFile === '' ||
-                    formInline.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                            @click="clickButtonToUpload('accessoryFile',index)">
+                    {{ (item.accessoryFile === 'null' || item.accessoryFile === '' ||
+                    item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                     }}
                   </a-button>
                 </a-form-model-item>
@@ -83,6 +83,7 @@
         </div>
       </a-form-model>
     </div>
+    <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
   </div>
 </template>
 
@@ -104,7 +105,9 @@
     data() {
       return {
         formInline: {},
+        disabled:false,
         rules: {},
+        uploadIndex:'',
         dataList: [
           {
             relatedSection: '',
@@ -116,10 +119,11 @@
       }
     },
     methods: {
-      clickButtonToUpload(item) {
+      clickButtonToUpload(item,index) {
         this.$refs.uploadFile.perentHandleFunc()
         this.$refs.uploadFile.visible = true
         this.uploadName = item
+        this.uploadIndex = index
         getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
           if (res.success) {
             this.$refs.uploadFile.perentHandleFunc(res.result)
@@ -137,8 +141,8 @@
           })
         }
         /** 赋值给当前对应的表单文件 */
-        this.formInline[this.uploadName] = attIdList.join(',')
-        this.formInline = { ...this.formInline }
+        this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
+        this.dataList = [...this.dataList]
       },
       addData() {
         this.dataList.push({
diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
index 5f980019f..a79ddd595 100644
--- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
@@ -13,6 +13,7 @@
           :standardContentQuery="queryProject"
         />
         <feedbackInformation
+          v-if="isDisplay"
           ref="feedbackInformationRef"
           :title="$t('feedbackInformation')"
         />
@@ -35,6 +36,7 @@
   import circulationHistory from '../../components/regulatoryCirculationHistory'
   import footerProcess from '../../components/footerProcess'
   import feedbackInformation from '../../components/feedbackInformation'
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
 
   export default {
     name: 'index',
@@ -49,7 +51,10 @@
 
       return {
         title: this.$t('collectionOfRegulatoryOpinions'),
-        url: {},
+        url: {
+          queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds',
+          list: '/lawsOpinionGather/lawsOpinionAssessmentResultEO/list'
+        },
         isDisplay: true,
         queryProject: {},
         standardContentList: [
@@ -87,8 +92,35 @@
       }
     },
     mounted() {
+      this.queryTaskDetailByTask(() => {
+        this.lawsOpinionAssessmentResult()
+      })
     },
     methods: {
+      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.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
       preservation() {
 
       },

From 7eb2019aaee5002c2dac1a9f459c48189f9ce5fa Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 6 Jul 2022 15:50:30 +0800
Subject: [PATCH 14/25] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86-=E4=BF=9D=E5=AD=98=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E8=A1=A8=E8=8E=B7=E5=8F=96=E5=88=9B=E5=BB=BA=E4=BA=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsProcessHistoryEOServiceImpl.java | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

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 7c9c84aa2..a8e64f79f 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
@@ -13,13 +13,18 @@ import com.jero.modules.lawsOpinionGather.mapper.LawsProcessHistoryEOMapper;
 import com.jero.modules.lawsOpinionGather.service.ILawsProcessHistoryEOService;
 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;
 
 import javax.servlet.http.HttpServletRequest;
@@ -33,6 +38,9 @@ import javax.servlet.http.HttpServletRequest;
 @Service
 public class LawsProcessHistoryEOServiceImpl extends ServiceImpl<LawsProcessHistoryEOMapper, LawsProcessHistoryEO> implements ILawsProcessHistoryEOService {
 
+	@Autowired
+	private ISysUserService sysUserService;
+
 	/**
 	 * 保存
 	 *
@@ -142,7 +150,27 @@ public class LawsProcessHistoryEOServiceImpl extends ServiceImpl<LawsProcessHist
 				lawsProcessHistoryEO = JSONObject.parseObject(JSONObject.toJSONString(lawsProcessHistory),LawsProcessHistoryEO.class);
 				lawsProcessHistoryEOList.add(lawsProcessHistoryEO);
 			}
-			this.saveBatch(lawsProcessHistoryEOList);
+			if(CollectionUtils.isNotEmpty(lawsProcessHistoryEOList)){
+				List<String> createUserId = lawsProcessHistoryEOList.stream().map(LawsProcessHistoryEO::getCreateBy).distinct().collect(Collectors.toList());
+				if(CollectionUtils.isNotEmpty(createUserId)){
+					QueryWrapper<SysUser> queryUserWrapper = new QueryWrapper<>();
+					queryUserWrapper.lambda().in(SysUser::getId,createUserId);
+					List<SysUser> sysUserList = sysUserService.getBaseMapper().selectList(queryUserWrapper);
+
+					lawsProcessHistoryEOList.forEach(lawsProcessHistory -> {
+						String createBy = sysUserList.stream().filter(e -> {
+							boolean flag = false;
+							if (StringUtils.equals(e.getId(), lawsProcessHistory.getCreateBy())) {
+								flag = true;
+							}
+							return flag;
+						}).map(SysUser::getUsername).distinct().collect(Collectors.toList()).get(0);
+						lawsProcessHistory.setCreateBy(createBy);
+					});
+				}
+
+				this.saveBatch(lawsProcessHistoryEOList);
+			}
 		}
 
 		return new Result<>().success("调用成功！");

From d4c86d08aaf49d41b10c1ac4ae4aab967a3f625f Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Wed, 6 Jul 2022 16:01:07 +0800
Subject: [PATCH 15/25] =?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-=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=AF=BC=E5=87=BA=E4=B8=8B=E6=8B=89=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql | 15 +++++++++
 .../ParamsReportDetailEOController.java       | 32 +++++++++++++++++-
 .../service/IParamsReportDetailEOService.java |  3 ++
 .../impl/ParamsReportDetailEOServiceImpl.java | 33 ++++++++++++++-----
 4 files changed, 74 insertions(+), 9 deletions(-)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index fa6abf466..0ded1e880 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -182,3 +182,18 @@ ALTER TABLE `laws_weilai`.`params_report_config`
 -- 法规意见收集添加字段  文档库/标准id
 ALTER TABLE `laws_opinion_gather`
     ADD COLUMN `stand_id` varchar(64) NULL COMMENT '文档库/标准id' AFTER `acti_proc_inst_id`;
+
+-- 上报库导出历史表
+CREATE TABLE `params_report_export_history` (
+    `id` varchar(36) NOT NULL,
+    `create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
+    `create_time` datetime DEFAULT NULL COMMENT '创建日期',
+    `update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
+    `update_time` datetime DEFAULT NULL COMMENT '更新日期',
+    `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
+    `params_manifest_id` varchar(50) DEFAULT NULL COMMENT '上报库id',
+    `export_type` varchar(50) DEFAULT NULL COMMENT '导出类型',
+    `export_time` datetime DEFAULT NULL COMMENT '导出时间',
+    `export_file_id` varchar(50) DEFAULT NULL COMMENT '导出文件id',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
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 51494c3c4..718155cc4 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
@@ -96,7 +96,7 @@ public class ParamsReportDetailEOController extends JeroController<ParamsReportD
 	}
 
 	/**
-	 *  冻结配置-下拉选项
+	 *  配置下拉选项(常规导出)
 	 *
 	 * @param paramsReportDetailVO
 	 * @return
@@ -110,4 +110,34 @@ public class ParamsReportDetailEOController extends JeroController<ParamsReportD
 		return Result.OK(configLabelList);
 	}
 
+	/**
+	 *  配置下拉选项(自定义导出)
+	 *
+	 * @param paramsReportDetailVO
+	 * @return
+	 */
+	@AutoLog(value = "上报库参数项-配置下拉选项(自定义导出)")
+	@ApiOperation(value="上报库参数项-配置下拉选项(自定义导出)", notes="上报库参数项-配置下拉选项(自定义导出)")
+	@GetMapping(value = "/getConfigLabelListCustom")
+//	@RequiresPermissions("report:detail:export:custom")
+	public Result<?> getConfigLableListCustom(ParamsReportDetailVO paramsReportDetailVO) {
+		List<Map<String, String>> configLabelList = paramsReportDetailEOService.getConfigLabelList(paramsReportDetailVO);
+		return Result.OK(configLabelList);
+	}
+
+	/**
+	 *  导出模板下拉选项
+	 *
+	 * @param
+	 * @return
+	 */
+	@AutoLog(value = "上报库参数项-导出模板下拉选项")
+	@ApiOperation(value="上报库参数项-导出模板下拉选项", notes="上报库参数项-导出模板下拉选项")
+	@GetMapping(value = "/getTemplateLabelList")
+//	@RequiresPermissions("report:detail:export:custom")
+	public Result<?> getTemplateLabelList() {
+		List<Map<String, String>> templateLabelList = paramsReportDetailEOService.getTemplateLabelList();
+		return Result.OK(templateLabelList);
+	}
+
 }
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java
index b9150f5f5..6c65c50d2 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java
@@ -40,4 +40,7 @@ public interface IParamsReportDetailEOService extends IService<ParamsReportDetai
 
 	// 配置-下拉选项
 	List<Map<String, String>> getConfigLabelList(ParamsReportDetailVO paramsReportDetailVO);
+
+	// 导出模板下拉选项
+	List<Map<String, String>> getTemplateLabelList();
 }
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 f31c090aa..18b71515c 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
@@ -18,16 +18,10 @@ import com.jero.modules.cert.collect.entity.*;
 import com.jero.modules.cert.collect.enums.CollectManifestStateEnum;
 import com.jero.modules.cert.collect.enums.ConfigDataTypeEnum;
 import com.jero.modules.cert.collect.vo.ParamsConfigDataVO;
-import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO;
-import com.jero.modules.cert.report.entity.ParamsReportConfigEO;
-import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
-import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO;
+import com.jero.modules.cert.report.entity.*;
 import com.jero.modules.cert.report.enums.ExportTypeEnum;
 import com.jero.modules.cert.report.mapper.ParamsReportDetailEOMapper;
-import com.jero.modules.cert.report.service.IParamsReportConfigDataEOService;
-import com.jero.modules.cert.report.service.IParamsReportConfigEOService;
-import com.jero.modules.cert.report.service.IParamsReportDetailEOService;
-import com.jero.modules.cert.report.service.IParamsReportExportHistoryEOService;
+import com.jero.modules.cert.report.service.*;
 import com.jero.modules.cert.report.vo.ParamsReportDetailVO;
 import com.jero.modules.cert.template.enums.ControlTypeEnum;
 import com.jero.modules.document.enums.FieldTypeEnum;
@@ -647,6 +641,29 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 		return configLabelList;
 	}
 
+	@Autowired
+	private IParamsExportTemplateEOService paramsExportTemplateEOService;
+
+	@Override
+	public List<Map<String, String>> getTemplateLabelList() {
+		// 查询所有导出模板
+		LambdaQueryWrapper<ParamsExportTemplateEO> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.orderByDesc(ParamsExportTemplateEO::getCreateTime);
+		List<ParamsExportTemplateEO> paramsExportTemplateEOList = paramsExportTemplateEOService.list(queryWrapper);
+
+		List<Map<String, String>> templateLabelList = new ArrayList<>();
+		if (CollectionUtil.isNotEmpty(paramsExportTemplateEOList)) {
+			for (ParamsExportTemplateEO paramsExportTemplateEO : paramsExportTemplateEOList) {
+				Map<String, String> map = new HashMap<>();
+				map.put("label", paramsExportTemplateEO.getTemplateName());
+				map.put("value", paramsExportTemplateEO.getId());
+				templateLabelList.add(map);
+			}
+		}
+
+		return templateLabelList;
+	}
+
 	private void downLoadFileList(List<OSSFile> allRelevFileList,String fileNowPath) {
 		File nowFile = new File(fileNowPath);
 		if (nowFile.exists()){

From ad697d08a4a6530223c0ccf6ac534bdb1ec19a6f Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 6 Jul 2022 16:21:51 +0800
Subject: [PATCH 16/25] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=94=B6=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/initiatingProcess.vue          |  9 ++++--
 .../collectionOfRegulatoryOpinions/index.vue  |  2 +-
 .../components/feedbackInformation.vue        | 32 +++++++++++++------
 .../processForm/regulatoryProcess/index.vue   | 18 ++++++++++-
 4 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
index 83b65895a..da9dbdace 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
@@ -107,6 +107,7 @@
         />
       </div>
     </div>
+    <JLoading :loading="JLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
     <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
   </div>
 </template>
@@ -140,6 +141,7 @@
           addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy'
         },
         loading: false,
+        JLoading:false,
         dataSource: [],
         selectedRowKeys: [],
         total: 0,
@@ -308,6 +310,7 @@
             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
               delete value.id
@@ -332,6 +335,8 @@
         postAction('/workFlow/startProcess', query).then((res) => {
           if (res.success) {
             this.completeTask(value, res.result)
+          }else{
+            this.JLoading = false
           }
         })
       },
@@ -349,12 +354,12 @@
             //   window.close()
             // }, 1000)
             this.$message.success(this.$t('OperationSuccessful'))
-            this.loading = false
+            this.JLoading = false
             this.$router.push({
               path: '/collectionOfRegulatoryOpinions'
             })
           } else {
-            this.loading = false
+            this.JLoading = false
             this.$message.warning(this.$t('operationFailed'))
           }
         })
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
index 09e85fbb2..c99d75f49 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
@@ -136,7 +136,7 @@
             align: 'center',
             width: 170,
             ellipsis: true,
-            dataIndex: 'technologyTerritory'
+            dataIndex: 'technologyTerritoryShow'
           },
           {
             title: this.$t('collectResults'),
diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue
index 559d8ce6f..bda8ce474 100644
--- a/jero-web/src/views/processCenter/components/feedbackInformation.vue
+++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue
@@ -100,7 +100,13 @@
       title: {
         type: String,
         default: ''
-      }
+      },
+      feedbackDataList:{
+        type: Array,
+        default: (()=>{
+           return []
+        })
+      },
     },
     data() {
       return {
@@ -108,16 +114,24 @@
         disabled:false,
         rules: {},
         uploadIndex:'',
-        dataList: [
-          {
-            relatedSection: '',
-            issueOrSuggest: '',
-            reason: '',
-            accessoryFile: ''
-          }
-        ]
+        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()
diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
index a79ddd595..67da54846 100644
--- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
@@ -15,6 +15,7 @@
         <feedbackInformation
           v-if="isDisplay"
           ref="feedbackInformationRef"
+          :feedbackDataList="feedbackDataList"
           :title="$t('feedbackInformation')"
         />
         <footerProcess
@@ -27,6 +28,7 @@
         <circulationHistory v-if="isDisplay"/>
       </div>
     </div>
+    <JLoading :loading="loading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
   </div>
 </template>
 
@@ -55,12 +57,13 @@
           queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds',
           list: '/lawsOpinionGather/lawsOpinionAssessmentResultEO/list'
         },
+        loading: false,
         isDisplay: true,
         queryProject: {},
         standardContentList: [
           {
             title: this.$t('standard'),
-            value: 'serialNumber'
+            value: 'serial_number'
           },
           {
             title: this.$t('title'),
@@ -92,6 +95,7 @@
       }
     },
     mounted() {
+      this.isDisplay = false
       this.queryTaskDetailByTask(() => {
         this.lawsOpinionAssessmentResult()
       })
@@ -115,14 +119,26 @@
           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() {
 
+      },
+      insertBatch(list) {
+        postAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/insertBatch', list).then((res) => {
+          if (res.success) {
+
+          }else{
+
+          }
+        })
       },
       submit() {
 

From 094a0f31cbcdb27314bac0c1af601e0230a10a3d Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 6 Jul 2022 16:32:16 +0800
Subject: [PATCH 17/25] =?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?=E8=A1=A8-=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AE=8C=E5=96=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsOpinionAssessmentResultEOController.java         | 4 ++--
 .../service/ILawsOpinionAssessmentResultEOService.java   | 4 +++-
 .../impl/LawsOpinionAssessmentResultEOServiceImpl.java   | 9 +++++++--
 3 files changed, 12 insertions(+), 5 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 54e97279b..6d5c5cc27 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
@@ -66,8 +66,8 @@ public class LawsOpinionAssessmentResultEOController extends JeroController<Laws
 	@AutoLog(value = "法规意见收集-评估结果表-列表查询")
     @ApiOperation(value="法规意见收集-评估结果表-列表查询", notes="法规意见收集-评估结果表-列表查询")
 	@GetMapping(value = "/list")
-	public Result<List<LawsOpinionAssessmentResultEO>> queryList() {
-        List<LawsOpinionAssessmentResultEO> list = lawsOpinionAssessmentResultEOService.queryList();
+	public Result<List<LawsOpinionAssessmentResultEO>> queryList(LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO,HttpServletRequest req,String cut) {
+        List<LawsOpinionAssessmentResultEO> list = lawsOpinionAssessmentResultEOService.queryList(lawsOpinionAssessmentResultEO,req,cut);
         return Result.OK(list);
 	}
 
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 97c166753..cb35be57d 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
@@ -2,6 +2,8 @@ package com.jero.modules.lawsOpinionGather.service;
 
 import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO;
 import com.baomidou.mybatisplus.extension.service.IService;
+
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -57,7 +59,7 @@ public interface ILawsOpinionAssessmentResultEOService extends IService<LawsOpin
 	 *
 	 * @return
 	 */
-    List<LawsOpinionAssessmentResultEO> queryList();
+    List<LawsOpinionAssessmentResultEO> queryList(LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO, HttpServletRequest req,String cut);
 
 	/**
 	 * 批量新增
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 8549a230f..f4d361405 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,6 +1,7 @@
 package com.jero.modules.lawsOpinionGather.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO;
 import com.jero.modules.lawsOpinionGather.mapper.LawsOpinionAssessmentResultEOMapper;
@@ -12,6 +13,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
@@ -87,8 +90,10 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
 	 * @return
 	 */
 	@Override
-    public List<LawsOpinionAssessmentResultEO> queryList() {
-        return list();
+    public List<LawsOpinionAssessmentResultEO> queryList(LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO, HttpServletRequest req,String cut) {
+		QueryWrapper<LawsOpinionAssessmentResultEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsOpinionAssessmentResultEO, req.getParameterMap());
+		List<LawsOpinionAssessmentResultEO> list = this.list(queryWrapper);
+		return list;
     }
 
 	@Override

From 76f5443543b79bab95e54429d71e20ebcceecbf8 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 6 Jul 2022 16:41:51 +0800
Subject: [PATCH 18/25] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=94=B6=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processForm/regulatoryProcess/index.vue   | 58 ++++++++++++++++---
 1 file changed, 51 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
index 67da54846..23a930be7 100644
--- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
@@ -39,6 +39,8 @@
   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: 'index',
@@ -59,6 +61,7 @@
         },
         loading: false,
         isDisplay: true,
+        feedbackDataList: [],
         queryProject: {},
         standardContentList: [
           {
@@ -101,6 +104,7 @@
       })
     },
     methods: {
+      ...mapGetters(['userInfo']),
       queryTaskDetailByTask(callback) {
         this.loading = true
         getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => {
@@ -129,19 +133,59 @@
         })
       },
       preservation() {
-
+        this.loading = true
+        let dataList = this.$refs.feedbackInformationRef.dataList
+        this.insertBatch(dataList, 1)
       },
-      insertBatch(list) {
-        postAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/insertBatch', list).then((res) => {
+      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) {
-
-          }else{
-
+            if (num == 1) {
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.loading = false
+              this.$router.push({
+                path: '/collectionOfRegulatoryOpinions'
+              })
+            } 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'))
+          }
+        })
       }
     }
   }

From 82455f37fae3b361f54a074684587bc600fb5dff Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 6 Jul 2022 16:49:19 +0800
Subject: [PATCH 19/25] =?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?=E8=A1=A8-=E6=89=B9=E9=87=8F=E6=96=B0=E5=A2=9E=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AE=8C=E5=96=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsOpinionAssessmentResultEOController.java  |  7 +++++--
 .../ILawsOpinionAssessmentResultEOService.java    |  5 +++--
 .../LawsOpinionAssessmentResultEOServiceImpl.java | 15 ++++++++++++++-
 3 files changed, 22 insertions(+), 5 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 6d5c5cc27..a47f57b8f 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
@@ -1,9 +1,12 @@
 package com.jero.modules.lawsOpinionGather.controller;
 
+import java.util.ArrayList;
 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.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO;
@@ -170,8 +173,8 @@ public class LawsOpinionAssessmentResultEOController extends JeroController<Laws
 	 @AutoLog(value = "法规意见收集-评估结果表-添加")
 	 @ApiOperation(value="法规意见收集-评估结果表-添加", notes="法规意见收集-评估结果表-添加")
 	 @PostMapping(value = "/insertBatch")
-	 public Result<?> insertBatch(@Validated @RequestBody List<LawsOpinionAssessmentResultEO> lawsOpinionAssessmentResultEOList) {
-		 this.lawsOpinionAssessmentResultEOService.insertBatch(lawsOpinionAssessmentResultEOList);
+	 public Result<?> insertBatch(@RequestBody JSONObject json) {
+		 this.lawsOpinionAssessmentResultEOService.insertBatch(json);
 		 return Result.OK("添加成功！");
 	 }
 }
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 cb35be57d..f5f7a15c2 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
@@ -1,5 +1,6 @@
 package com.jero.modules.lawsOpinionGather.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -63,7 +64,7 @@ public interface ILawsOpinionAssessmentResultEOService extends IService<LawsOpin
 
 	/**
 	 * 批量新增
-	 * @param lawsOpinionAssessmentResultEOList
+	 * @param json
 	 */
-    void insertBatch(List<LawsOpinionAssessmentResultEO> lawsOpinionAssessmentResultEOList);
+    void insertBatch(JSONObject json);
 }
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 f4d361405..b2ca31154 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,5 +1,7 @@
 package com.jero.modules.lawsOpinionGather.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.common.system.vo.LoginUser;
@@ -9,6 +11,8 @@ import com.jero.modules.lawsOpinionGather.service.ILawsOpinionAssessmentResultEO
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.shiro.SecurityUtils;
 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;
@@ -97,7 +101,16 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
     }
 
 	@Override
-	public void insertBatch(List<LawsOpinionAssessmentResultEO> lawsOpinionAssessmentResultEOList) {
+	public void insertBatch(JSONObject json) {
+		List<LawsOpinionAssessmentResultEO> lawsOpinionAssessmentResultEOList = new ArrayList<>();
+		JSONArray dataList = json.getJSONArray("dataList");
+		LawsOpinionAssessmentResultEO lawsOpinionAssessmentResult = null;
+
+		for (Object data : dataList) {
+			lawsOpinionAssessmentResult = JSONObject.parseObject(JSONObject.toJSONString(data),LawsOpinionAssessmentResultEO.class);
+			lawsOpinionAssessmentResultEOList.add(lawsOpinionAssessmentResult);
+		}
+
 		if (CollectionUtils.isNotEmpty(lawsOpinionAssessmentResultEOList)) {
 			LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 

From 93dc6f4db930f5568571509f3b582350d9add223 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 6 Jul 2022 17:01:05 +0800
Subject: [PATCH 20/25] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86-=E5=A2=9E=E5=8A=A0=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=8C=E4=BE=9B=E6=B3=95=E8=A7=84=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=E6=94=B6=E9=9B=86=E5=88=97=E8=A1=A8=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=9B=BE=E3=80=81=E6=B5=81=E7=A8=8B=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=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                 | 3 +++
 .../modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 0ded1e880..8ebc0bbb7 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -182,6 +182,9 @@ ALTER TABLE `laws_weilai`.`params_report_config`
 -- 法规意见收集添加字段  文档库/标准id
 ALTER TABLE `laws_opinion_gather`
     ADD COLUMN `stand_id` varchar(64) NULL COMMENT '文档库/标准id' AFTER `acti_proc_inst_id`;
+-- 法规意见收集添加字段  流程编号
+ALTER TABLE `laws_opinion_gather`
+    ADD COLUMN `prc_num` varchar(64) NULL COMMENT '流程编号' AFTER `stand_id`;
 
 -- 上报库导出历史表
 CREATE TABLE `params_report_export_history` (
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 d21113dd0..f74919082 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
@@ -107,4 +107,8 @@ public class LawsOpinionGatherEO implements Serializable {
     @ApiModelProperty(value = "文档库/标准id")
     private String standId;
 
+    @Excel(name = "流程编号", width = 15)
+    @ApiModelProperty(value = "流程编号")
+    private String prcNum;
+
 }

From 67804675bd58582c0ee62f76d3bd0ed9397dd7f9 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 6 Jul 2022 17:11:30 +0800
Subject: [PATCH 21/25] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=94=B6=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/initiatingProcess.vue          |  3 +--
 .../collectionOfRegulatoryOpinions/index.vue  | 15 ++++++++++---
 .../components/feedbackInformation.vue        |  2 +-
 .../regulatoryCirculationHistory.vue          | 14 ++++++-------
 .../processForm/processDetails/index.vue      | 21 ++++++++++++++-----
 .../processForm/regulatoryProcess/index.vue   |  2 +-
 .../tabComponents/alreadyProcess/index.vue    |  3 ++-
 .../tabComponents/alreadySend/index.vue       |  3 ++-
 .../tabComponents/monitorProcess/index.vue    |  3 ++-
 9 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
index da9dbdace..4c8e45171 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
@@ -313,6 +313,7 @@
               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
@@ -341,8 +342,6 @@
         })
       },
       completeTask(value, taskId) {
-        let operatorTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
-        value.operatorTime = operatorTime
         let query = {
           userid: this.userInfo().id,
           taskId: taskId,
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
index c99d75f49..ce910fc71 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
@@ -74,7 +74,8 @@
       >
          <span slot="operation" slot-scope="text,record">
            <a class="text-operation" @click="viewProcessClick(record)">{{$t('viewProcess')}}</a>
-           <a class="text-operation" @click="evaluationResultsClick(record)">{{$t('evaluationResults')}}</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">
@@ -223,8 +224,16 @@
         // })
         window.open(newUrl.href, '_blank')
       },
-      viewProcessClick() {
-
+      viewProcessClick(row) {
+        let newUrl = this.$router.resolve({
+          path: '/processDetails',
+          query: {
+            prcNum: row.prcNum,
+            prcType: 5,
+            prcId: row.actiProcInstId
+          }
+        })
+        window.open(newUrl.href, '_blank')
       },
       evaluationResultsClick(row) {
         this.$refs.evaluationResultsListRef.getData(JSON.parse(JSON.stringify(row)))
diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue
index bda8ce474..2eb3fd2ce 100644
--- a/jero-web/src/views/processCenter/components/feedbackInformation.vue
+++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue
@@ -138,7 +138,7 @@
         this.$refs.uploadFile.visible = true
         this.uploadName = item
         this.uploadIndex = index
-        getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+        getAction('sys/common/getFileInfos', { id: this.dataList[this.uploadIndex][this.uploadName] }).then((res) => {
           if (res.success) {
             this.$refs.uploadFile.perentHandleFunc(res.result)
           } else {
diff --git a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
index 3ece69515..542632113 100644
--- a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
+++ b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
@@ -33,27 +33,27 @@
         columns: [
           {
             title: this.$t('operationContent'),
-            dataIndex: 'name',
+            dataIndex: 'taskDefinitionKeyName',
             align: 'center',
-            width: '20%'
+            width: '25%'
           },
           {
             title: this.$t('Operator'),
-            dataIndex: 'assignee',
+            dataIndex: 'createBy',
             align: 'center',
-            width: '20%'
+            width: '25%'
           },
           {
             title: this.$t('role'),
-            dataIndex: 'approvalOpinion',
+            dataIndex: 'operatorRoleName',
             align: 'center',
-            width: '20%'
+            width: '25%'
           },
           {
             title: this.$t('operationTime'),
             dataIndex: 'createTime',
             align: 'center',
-            width: '20%',
+            width: '25%',
             customRender: function(t, r, index) {
               return moment(t).format('YYYY-MM-DD HH:mm:ss')
             }
diff --git a/jero-web/src/views/processCenter/processForm/processDetails/index.vue b/jero-web/src/views/processCenter/processForm/processDetails/index.vue
index 6c0c3a150..88a529300 100644
--- a/jero-web/src/views/processCenter/processForm/processDetails/index.vue
+++ b/jero-web/src/views/processCenter/processForm/processDetails/index.vue
@@ -13,12 +13,14 @@
     </div>
     <div class="action-bar">
     </div>
-    <circulationHistory/>
+    <regulatoryCirculationHistory v-if="$route.query.prcType == '5'"/>
+    <circulationHistory v-else/>
   </div>
 </template>
 
 <script>
   import circulationHistory from '../../components/circulationHistory'
+  import regulatoryCirculationHistory from '../../components/regulatoryCirculationHistory'
   import axios from 'axios'
   import Vue from 'vue'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
@@ -26,7 +28,8 @@
   export default {
     name: 'processDetails',
     components: {
-      circulationHistory
+      circulationHistory,
+      regulatoryCirculationHistory
     },
     data() {
       return {
@@ -45,6 +48,16 @@
       },
       // 请求转换流程图
       processNum() {
+        let params = {}
+        if (this.$route.query.prcType == 5){
+          params = {
+            prcId: this.$route.query.prcId
+          }
+        }else{
+          params = {
+            prcNum: this.$route.query.prcNum
+          }
+        }
         axios.request({
           url: '/jero-boot/workFlow/getImg?_t=' + new Date().getTime(),
           responseType: 'blob',
@@ -52,9 +65,7 @@
           headers: {
             'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)
           },
-          params: {
-            prcNum: this.$route.query.prcNum
-          }
+          params: params
         }).then(res => {
           this.processStep = window.URL.createObjectURL(res.data)
         })
diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
index 23a930be7..165d6d740 100644
--- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
@@ -146,10 +146,10 @@
           if (res.success) {
             if (num == 1) {
               this.$message.success(this.$t('OperationSuccessful'))
-              this.loading = false
               this.$router.push({
                 path: '/collectionOfRegulatoryOpinions'
               })
+              this.loading = false
             } else {
               this.completeTask()
             }
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 f50da247c..cacd6f524 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue
@@ -157,7 +157,8 @@
           path: '/processDetails',
           query: {
             prcNum: row.prcNum,
-            prcType:row.prcType
+            prcType:row.prcType,
+            prcId:row.prcId,
           }
         })
         window.open(newUrl.href, '_blank')
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 28eab32a9..a9f08e126 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue
@@ -165,7 +165,8 @@
           path: '/processDetails',
           query: {
             prcNum: row.prcNum,
-            prcType:row.prcType
+            prcType:row.prcType,
+            prcId:row.prcId,
           }
         })
         window.open(newUrl.href, '_blank')
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 47221a072..848dcfc44 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue
@@ -163,7 +163,8 @@
           path: '/processDetails',
           query: {
             prcNum: row.prcNum,
-            prcType:row.prcType
+            prcType:row.prcType,
+            prcId:row.prcId,
           }
         })
         window.open(newUrl.href, '_blank')

From 91d0d57e0caba35a500da14d7c9aa0623c3cc51d Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 6 Jul 2022 17:49:10 +0800
Subject: [PATCH 22/25] =?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

---
 jero-web/src/components/tableCollection/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 2b668ed45..ab50d9fd6 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -461,7 +461,6 @@
                   align: 'center',
                   ellipsis: true,
                   sorter: res.sort,
-                  sortOrder: res.db_field_txt,
                   width: 500
                 })
                 num++

From 343e5c53d9a6cb71299176c6b0a9f25c0d9faa02 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Wed, 6 Jul 2022 17:56:22 +0800
Subject: [PATCH 23/25] =?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-bug55570?=
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 fecdef6f7..6b40d73bd 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
@@ -598,6 +598,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
     		controlValue = controlValue.replace("，", ",");
 			String[] controlValueStr = controlValue.split(",");
 			for (int i = 0; i < controlValueStr.length; i++) {
+				if (StringUtils.isBlank(controlValueStr[i])) { // 选项中的空字符串，不作为备选值
+					continue;
+				}
 				Map<String, String> controlValueMap = new HashMap<>();
 				controlValueMap.put("label", controlValueStr[i]);
 				controlValueMap.put("value", controlValueStr[i]);

From dd3e301e9046fa4978bb32aa01e281f01fa68670 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 6 Jul 2022 18:18:26 +0800
Subject: [PATCH 24/25] =?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

---
 .../src/views/projectManagement/dialog/historicalVersion.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/projectManagement/dialog/historicalVersion.vue b/jero-web/src/views/projectManagement/dialog/historicalVersion.vue
index 97ffea549..02ac90a58 100644
--- a/jero-web/src/views/projectManagement/dialog/historicalVersion.vue
+++ b/jero-web/src/views/projectManagement/dialog/historicalVersion.vue
@@ -74,7 +74,7 @@ export default {
       console.log(this.historicalRow,'this.historicalRow')
       let _this = this
       axios({
-        url: `/jero-boot/params/manifest/history?title=${this.historicalRow.title}`,
+        url: `/jero-boot/params/manifest/history?paramsManifestId=${this.historicalRow.id}`,
         method: 'get',
         transformRequest: [function (data) {
           let ret = ''

From c5087d63df45ed101ee26864923d29e93f203149 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Wed, 6 Jul 2022 18:25:30 +0800
Subject: [PATCH 25/25] =?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-bug55574?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql             | 4 ++++
 .../collect/controller/ParamsManifestEOController.java    | 8 +++-----
 .../cert/collect/entity/ParamsManifestHistoryEO.java      | 6 ++++++
 .../collect/mapper/xml/ParamsManifestHistoryEOMapper.xml  | 1 +
 .../cert/collect/service/IParamsManifestEOService.java    | 2 +-
 .../collect/service/IParamsManifestHistoryEOService.java  | 2 +-
 .../collect/service/impl/ParamsManifestEOServiceImpl.java | 6 ++----
 .../service/impl/ParamsManifestHistoryEOServiceImpl.java  | 5 +++--
 8 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 8ebc0bbb7..0d3bbfbef 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -200,3 +200,7 @@ CREATE TABLE `params_report_export_history` (
     `export_file_id` varchar(50) DEFAULT NULL COMMENT '导出文件id',
     PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 参数清单历史版本 添加字段
+ALTER TABLE `laws_weilai`.`params_manifest_history`
+    ADD COLUMN `source_params_manifest_id` varchar(50) NULL COMMENT '源参数清单id' AFTER `params_template_publish_version`;
\ No newline at end of file
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
index 88cada6f2..232eab6f5 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
@@ -15,8 +15,6 @@ import com.jero.modules.cert.collect.service.IParamsConfigEOService;
 import com.jero.modules.cert.collect.service.IParamsManifestEOService;
 import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO;
 import com.jero.modules.cert.collect.vo.ParamsManifestVO;
-import com.jero.modules.cert.report.entity.ParamsExportTemplateEO;
-import com.jero.modules.cert.report.enums.ExportTemplateStateEnum;
 import com.jero.modules.cert.template.entity.ParamsTemplateEO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -244,15 +242,15 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	 /**
 	  * 历史版本
 	  * 根据标题查询
-	  * @param title
+	  * @param paramsManifestId
 	  * @return
 	  */
 	 @AutoLog(value = "参数清单-历史版本")
 	 @ApiOperation(value="参数清单-历史版本", notes="参数清单-历史版本")
 	 @GetMapping(value = "/history")
 	 @RequiresPermissions("params:manifest:history")
-	 public Result<?> history(@RequestParam(name="title",required=true) String title) {
-		 List<ParamsManifestHistoryVO> historyVersionList = paramsManifestEOService.getHistoryVersionList(title);
+	 public Result<?> history(@RequestParam(name="paramsManifestId",required=true) String paramsManifestId) {
+		 List<ParamsManifestHistoryVO> historyVersionList = paramsManifestEOService.getHistoryVersionList(paramsManifestId);
 		 return Result.OK(historyVersionList);
 	 }
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestHistoryEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestHistoryEO.java
index f32edfa62..8195a357f 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestHistoryEO.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestHistoryEO.java
@@ -2,9 +2,11 @@ package com.jero.modules.cert.collect.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
 
 import java.io.Serializable;
 
@@ -23,4 +25,8 @@ import java.io.Serializable;
 public class ParamsManifestHistoryEO extends ParamsManifestEO implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    /**版本*/
+    @Excel(name = "源参数清单id", width = 15)
+    @ApiModelProperty(value = "源参数清单id")
+    private String sourceParamsManifestId;
 }
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml
index 803567144..f0ed93178 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml
@@ -15,5 +15,6 @@
         <result column="version" property="version" />
         <result column="project_id" property="projectId" />
         <result column="params_template_publish_version" property="paramsTemplatePublishVersion" />
+        <result column="source_params_manifest_id" property="sourceParamsManifestId" />
     </resultMap>
 </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/IParamsManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java
index d11b9d640..972245644 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java
@@ -74,7 +74,7 @@ public interface IParamsManifestEOService extends IService<ParamsManifestEO> {
 
 	boolean changeExtension(String id, String cut);
 
-	List<ParamsManifestHistoryVO> getHistoryVersionList(String title);
+	List<ParamsManifestHistoryVO> getHistoryVersionList(String paramsManifestId);
 
 	IPage getAllManifest(IPage page, String projectName);
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java
index 3dd20e90b..c66c62790 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java
@@ -16,5 +16,5 @@ public interface IParamsManifestHistoryEOService extends IService<ParamsManifest
 
 	void addForChangeExtension(String paramsManifestId);
 
-	List<ParamsManifestHistoryVO> getHistoryVersionList(String title);
+	List<ParamsManifestHistoryVO> getHistoryVersionList(String paramsManifestId);
 }
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 730bc2942..843676384 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
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.api.vo.Result;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
@@ -23,7 +22,6 @@ import com.jero.modules.cert.collect.service.*;
 import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO;
 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;
@@ -438,8 +436,8 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 	}
 
 	@Override
-	public List<ParamsManifestHistoryVO> getHistoryVersionList(String title) {
-		return paramsManifestHistoryEOService.getHistoryVersionList(title);
+	public List<ParamsManifestHistoryVO> getHistoryVersionList(String paramsManifestId) {
+		return paramsManifestHistoryEOService.getHistoryVersionList(paramsManifestId);
 
 	}
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java
index ccab4dd24..d5c88999d 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java
@@ -64,6 +64,7 @@ public class ParamsManifestHistoryEOServiceImpl extends ServiceImpl<ParamsManife
 		BeanUtils.copyProperties(paramsManifestEO, paramsManifestHistoryEO);
 		String paramsManifestHistoryId = UUID.randomUUID().toString().replace("-","");
 		paramsManifestHistoryEO.setId(paramsManifestHistoryId);
+		paramsManifestHistoryEO.setSourceParamsManifestId(paramsManifestId); // 绑定 源清单
 
 		// 查询清单下配置
 		List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId);
@@ -131,10 +132,10 @@ public class ParamsManifestHistoryEOServiceImpl extends ServiceImpl<ParamsManife
 	}
 
 	@Override
-	public List<ParamsManifestHistoryVO> getHistoryVersionList(String title) {
+	public List<ParamsManifestHistoryVO> getHistoryVersionList(String paramsManifestId) {
 		// 同一项目下标题时唯一的，历史版本和当前版本通过标题进行关联
 		LambdaQueryWrapper<ParamsManifestHistoryEO> queryWrapper = new LambdaQueryWrapper<>();
-		queryWrapper.eq(ParamsManifestHistoryEO::getTitle, title)
+		queryWrapper.eq(ParamsManifestHistoryEO::getSourceParamsManifestId, paramsManifestId)
 				.orderByAsc(ParamsManifestHistoryEO::getVersion);
 		List<ParamsManifestHistoryEO> list = list(queryWrapper);
 		List<ParamsManifestHistoryVO> historyVersionList = new ArrayList<>();