From e1dd823e1931307cf1d917c8d10fbfdce9dbcdaa Mon Sep 17 00:00:00 2001
From: zer0Black <694429613@qq.com>
Date: Sun, 3 Jul 2022 15:36:02 +0800
Subject: [PATCH 01/31] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86?=
 =?UTF-8?q?=E7=A7=8D=EF=BC=8C=E4=BF=9D=E5=AD=98=E6=94=B9=E4=B8=BA=E6=9A=82?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js                               | 1 +
 jero-web/src/common/lang/zh-cn.js                               | 1 +
 .../components/ParameterItemCollectionList.vue                  | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 420faa5b6..5f80bd61b 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -757,6 +757,7 @@ module.exports = {
   operatethisbutton: 'You do not have permission to operate this button',
   ParameterLibrary: 'Parameter Library',
   referenceparameter: 'Reference Parameter',
+  tempSave: 'Temp Save',
   Assignedby: 'Assignedby',
   CompulsoryWithdrawal: 'CompulsoryWithdrawal',
   SynchronousReportLibrary: 'Synchronous Report Library',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 451c6f549..bc01f7713 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -772,6 +772,7 @@ module.exports = {
   operatethisbutton: '没有权限操作此按钮',
   ParameterLibrary: '参数库',
   referenceparameter: '引用参数',
+  tempSave: '暂存',
   Assignedby: '分配填写人',
   CompulsoryWithdrawal: '强制撤回',
   SynchronousReportLibrary: '同步上报库',
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 84f9605c4..f714583fd 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -133,7 +133,7 @@
             <!--            保存-->
             <div @click="handlePreservation(1)" class="operator-text" v-if='currentPersonRole == "dre"'>
               <a-icon type="check-circle"/>
-              {{$t('preservation')}}
+              {{$t('tempSave')}}
             </div>
             <!--      提交-->
             <div @click="handleSubmit" class="operator-text" v-if='currentPersonRole == "dre"'>

From a32348faa76f7c7a4c864bb3d4a395f049f587c0 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Mon, 4 Jul 2022 10:04:01 +0800
Subject: [PATCH 02/31] =?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-=E9=9C=80=E6=B1=82=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E7=82=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOController.java    | 27 ++++++++++++++-----
 .../xml/ParamsCollectManifestEOMapper.xml     |  3 +++
 .../IParamsCollectManifestEOService.java      |  6 ++++-
 .../ParamsCollectManifestEOServiceImpl.java   | 24 +++++++++++++++--
 4 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
index b3e4b0bed..7eea4e988 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
@@ -113,21 +113,21 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 	}
 
 	/**
-	 *   保存
+	 * 暂存
 	 *
 	 * @param paramsCollectManifestVO
 	 * @return
 	 */
-	@AutoLog(value = "参数项收集清单-保存")
-	@ApiOperation(value="参数项收集清单-保存", notes="参数项收集清单-保存")
+	@AutoLog(value = "参数项收集清单-暂存")
+	@ApiOperation(value="参数项收集清单-暂存", notes="参数项收集清单-暂存")
 	@PostMapping(value = "/save")
 //	@RequiresPermissions("params:collectManifest:save")
 	public Result<?> save(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) {
-		boolean isSuccess = paramsCollectManifestEOService.save(paramsCollectManifestVO.getConfigDataList());
+		boolean isSuccess = paramsCollectManifestEOService.save(paramsCollectManifestVO.getConfigDataList(), paramsCollectManifestVO.getParamsManifestId());
 		if (isSuccess) {
-			return Result.OK("保存成功！");
+			return Result.OK("暂存成功！");
 		} else {
-			return Result.error("保存失败！");
+			return Result.error("暂存失败！");
 		}
 	}
 
@@ -388,6 +388,21 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 		return Result.OK(configLableList);
 	}
 
+	/**
+	 *  冻结配置-回显已冻结的配置
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-回显已冻结的配置")
+	@ApiOperation(value="参数项收集清单-回显已冻结的配置", notes="参数项收集清单-回显已冻结的配置")
+	@PostMapping(value = "/getLockedConfigIdList")
+//	@RequiresPermissions("params:collectManifest:lock")
+	public Result<?> getLockedConfigIdList(ParamsCollectManifestVO paramsCollectManifestVO) {
+		List<String> lockedConfigIdList = paramsCollectManifestEOService.getLockedConfigIdList(paramsCollectManifestVO);
+		return Result.OK(lockedConfigIdList);
+	}
+
 	/**
 	 *  冻结配置
 	 *
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
index 0952a335f..5709b8d47 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
@@ -48,6 +48,9 @@
                 <if test="paramsCollectManifestEO.dutyTerritory !=null and paramsCollectManifestEO.dutyTerritory !=''">
                     AND duty_territory = #{paramsCollectManifestEO.dutyTerritory}
                 </if>
+                <if test="paramsCollectManifestEO.state !=null and paramsCollectManifestEO.state !=''">
+                    AND state = #{paramsCollectManifestEO.state}
+                </if>
                 <if test="paramsCollectManifestEO.paramsManifestId !=null and paramsCollectManifestEO.paramsManifestId !=''">
                     AND params_manifest_id = #{paramsCollectManifestEO.paramsManifestId}
                 </if>
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
index 7da49f229..bdfb056a0 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
@@ -85,9 +85,10 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
 	/**
 	 * 保存
 	 * @param configDataList
+	 * @param paramsManifestId
 	 * @return
 	 */
-	boolean save(List<Map<String, Object>> configDataList);
+	boolean save(List<Map<String, Object>> configDataList, String paramsManifestId);
 
 	/**
 	 * 查询清单所用模版参数项列表（过滤清单已添加的参数项）
@@ -127,6 +128,9 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
 	// 配置-下拉选项
 	List<Map<String, String>> getConfigLabelList(ParamsCollectManifestVO paramsCollectManifestVO);
 
+	// 冻结配置-回显已冻结的配置
+	List<String> getLockedConfigIdList(ParamsCollectManifestVO paramsCollectManifestVO);
+
 	// 冻结配置
 	boolean lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO);
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index d3b92f15d..7b54bd6f6 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
@@ -747,8 +747,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 	}
 
 	@Override
-	public boolean save(List<Map<String, Object>> configDataList) {
+	public boolean save(List<Map<String, Object>> configDataList, String paramsManifestId) {
 		List<ParamsConfigDataEO> newConfigDataEOList = new ArrayList<>();
+		List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列
+		List<String> paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());
+		List<ParamsConfigDataEO> paramsConfigDataEOList = paramsConfigDataEOService.queryListByConfigIdList(paramsConfigIdList); // 查询所有配置数据
 
 		// 处理数据
 		for (Map<String, Object> map : configDataList) {
@@ -768,7 +771,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				List<Map<String, Object>> paramsConfigDataVOList = (List<Map<String, Object>>) paramsConfigDataMap.get("list");
 
 				// 判断是新增还是修改
-				ParamsConfigDataEO oldConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId);
+//				ParamsConfigDataEO oldConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId);
+				ParamsConfigDataEO oldConfigDataEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId,paramsConfigDataEOList);
 				if (ObjectUtil.isNotEmpty(oldConfigDataEO)) {
 					paramsConfigDataEO.setId(oldConfigDataEO.getId());
 
@@ -1323,6 +1327,22 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		return configLabelList;
 	}
 
+	@Override
+	public List<String> getLockedConfigIdList(ParamsCollectManifestVO paramsCollectManifestVO) {
+		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
+
+		// 查询配置列
+		LambdaQueryWrapper<ParamsConfigEO> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(ParamsConfigEO::getParamsManifestId, paramsManifestId);
+		queryWrapper.eq(ParamsConfigEO::getIsLock, ConfigLockEnum.YES.getValue()); // 指定查询非冻结配置
+		queryWrapper.orderByAsc(ParamsConfigEO::getDisplaySeq);
+		List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.list(queryWrapper);
+
+		List<String> lockedConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());
+
+		return lockedConfigIdList;
+	}
+
 	@Override
 	public boolean lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO) {
 		if (StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId())) {

From c12cc42160516b87b50d2ed1c00bbba0fe5a64b5 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Mon, 4 Jul 2022 10:29:09 +0800
Subject: [PATCH 03/31] =?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-=E9=9C=80=E6=B1=82=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E7=82=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/controller/ParamsCollectManifestEOController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
index 7eea4e988..09e668c4a 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
@@ -396,7 +396,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 	 */
 	@AutoLog(value = "参数项收集清单-回显已冻结的配置")
 	@ApiOperation(value="参数项收集清单-回显已冻结的配置", notes="参数项收集清单-回显已冻结的配置")
-	@PostMapping(value = "/getLockedConfigIdList")
+	@GetMapping(value = "/getLockedConfigIdList")
 //	@RequiresPermissions("params:collectManifest:lock")
 	public Result<?> getLockedConfigIdList(ParamsCollectManifestVO paramsCollectManifestVO) {
 		List<String> lockedConfigIdList = paramsCollectManifestEOService.getLockedConfigIdList(paramsCollectManifestVO);

From 0df8425cbd1882a983a8142dc134cb0865966029 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 4 Jul 2022 10:42:59 +0800
Subject: [PATCH 04/31] =?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/components/CollectionType/index.vue   | 106 ++++++++++--------
 .../src/components/TaskCutOffTime/index.vue   |   2 +-
 .../src/components/tableCollection/index.vue  |   2 +-
 .../src/components/uploadFileChange/file.vue  |   2 +-
 .../ParameterItemCollectionList.vue           |  41 ++++++-
 5 files changed, 101 insertions(+), 52 deletions(-)

diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index e133eb8b3..f3b7439c7 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -24,7 +24,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--            中文-->
-            <div v-if="item.controlVerify == '2'">
+            <div v-else-if="item.controlVerify == '2'">
               <a-input class="box-input inputWid"
                        :disabled="item.isLock == '1' ? true: false"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
@@ -32,7 +32,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
-            <div v-if="item.controlVerify == '3'">
+            <div v-else-if="item.controlVerify == '3'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -41,7 +41,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--         正浮点书  -->
-            <div v-if="item.controlVerify == '4'">
+            <div v-else-if="item.controlVerify == '4'">
               <a-input class="box-input inputWid"
                        :disabled="item.isLock == '1' ? true: false"
                        onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
@@ -49,7 +49,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--         整数或小数  -->
-            <div v-if="item.controlVerify == '5'">
+            <div v-else-if="item.controlVerify == '5'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -57,7 +57,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--        一位小数    -->
-            <div v-if="item.controlVerify == '6'">
+            <div v-else-if="item.controlVerify == '6'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -66,7 +66,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            两位小数-->
-            <div v-if="item.controlVerify == '7'">
+            <div v-else-if="item.controlVerify == '7'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -75,7 +75,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            三位小数-->
-            <div v-if="item.controlVerify == '8'">
+            <div v-else-if="item.controlVerify == '8'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -84,7 +84,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            四位小数-->
-            <div v-if="item.controlVerify == '9'">
+            <div v-else-if="item.controlVerify == '9'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -156,7 +156,7 @@
               </a-select-option>
             </a-select>
           </div>
-          <div v-if='item.type==="text"'>
+          <div v-else-if='item.type==="text"'>
             <!--            文本校验  分情况-->
             <!--            1 无-->
             <!--            2 中文-->
@@ -176,7 +176,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--            中文-->
-            <div v-if="item.controlVerify == '2'">
+            <div v-else-if="item.controlVerify == '2'">
               <a-input class="box-input inputWid"
                        :maxLength="1000"
                        :disabled="item.isLock == '1' ? true: false"
@@ -185,7 +185,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
-            <div v-if="item.controlVerify == '3'">
+            <div v-else-if="item.controlVerify == '3'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -194,7 +194,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--         正浮点书  -->
-            <div v-if="item.controlVerify == '4'">
+            <div v-else-if="item.controlVerify == '4'">
               <a-input class="box-input inputWid"
                        :disabled="item.isLock == '1' ? true: false"
                        onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
@@ -202,7 +202,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--         整数或小数  -->
-            <div v-if="item.controlVerify == '5'">
+            <div v-else-if="item.controlVerify == '5'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -210,7 +210,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--        一位小数    -->
-            <div v-if="item.controlVerify == '6'">
+            <div v-else-if="item.controlVerify == '6'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -219,7 +219,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            两位小数-->
-            <div v-if="item.controlVerify == '7'">
+            <div v-else-if="item.controlVerify == '7'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -228,7 +228,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            三位小数-->
-            <div v-if="item.controlVerify == '8'">
+            <div v-else-if="item.controlVerify == '8'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -237,7 +237,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            四位小数-->
-            <div v-if="item.controlVerify == '9'">
+            <div v-else-if="item.controlVerify == '9'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -271,7 +271,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--            中文-->
-            <div v-if="item.controlVerify == '2'">
+            <div v-else-if="item.controlVerify == '2'">
               <a-input class="box-input inputWid"
                        :maxLength="1000"
                        :disabled="item.isLock == '1' ? true: false"
@@ -280,7 +280,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
-            <div v-if="item.controlVerify == '3'">
+            <div v-else-if="item.controlVerify == '3'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -289,7 +289,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--         正浮点书  -->
-            <div v-if="item.controlVerify == '4'">
+            <div v-else-if="item.controlVerify == '4'">
               <a-input class="box-input inputWid"
                        :disabled="item.isLock == '1' ? true: false"
                        onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
@@ -297,7 +297,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--         整数或小数  -->
-            <div v-if="item.controlVerify == '5'">
+            <div v-else-if="item.controlVerify == '5'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -305,7 +305,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--        一位小数    -->
-            <div v-if="item.controlVerify == '6'">
+            <div v-else-if="item.controlVerify == '6'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -314,7 +314,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            两位小数-->
-            <div v-if="item.controlVerify == '7'">
+            <div v-else-if="item.controlVerify == '7'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -323,7 +323,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            三位小数-->
-            <div v-if="item.controlVerify == '8'">
+            <div v-else-if="item.controlVerify == '8'">
               <a-input-number class="box-input inputWid"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -332,7 +332,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            四位小数-->
-            <div v-if="item.controlVerify == '9'">
+            <div v-else-if="item.controlVerify == '9'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -378,7 +378,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--            中文-->
-            <div v-if="item.controlVerify == '2'">
+            <div v-else-if="item.controlVerify == '2'">
               <a-input class="box-input inputWid"
                        :maxLength="1000"
                        :disabled="item.isLock == '1' ? true: false"
@@ -387,7 +387,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
-            <div v-if="item.controlVerify == '3'">
+            <div v-else-if="item.controlVerify == '3'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -396,7 +396,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--         正浮点书  -->
-            <div v-if="item.controlVerify == '4'">
+            <div v-else-if="item.controlVerify == '4'">
               <a-input class="box-input inputWid"
                        :disabled="item.isLock == '1' ? true: false"
                        onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
@@ -404,7 +404,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--         整数或小数  -->
-            <div v-if="item.controlVerify == '5'">
+            <div v-else-if="item.controlVerify == '5'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -412,7 +412,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--        一位小数    -->
-            <div v-if="item.controlVerify == '6'">
+            <div v-else-if="item.controlVerify == '6'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -421,7 +421,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            两位小数-->
-            <div v-if="item.controlVerify == '7'">
+            <div v-else-if="item.controlVerify == '7'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -430,7 +430,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            三位小数-->
-            <div v-if="item.controlVerify == '8'">
+            <div v-else-if="item.controlVerify == '8'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -439,7 +439,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            四位小数-->
-            <div v-if="item.controlVerify == '9'">
+            <div v-else-if="item.controlVerify == '9'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -472,7 +472,7 @@
               </a-select-option>
             </a-select>
           </div>
-          <div v-if='item.type==="file"'>
+          <div v-else-if='item.type==="file"'>
             <a-button type="primary" class="button-text inputWid"
                       @click="clickButtonToUpload(item)">
               {{ (item.dataValue === 'null' || item.dataValue === '' ||
@@ -496,7 +496,7 @@
               </a-select-option>
             </a-select>
           </div>
-          <div v-if='item.type==="file"'>
+          <div v-else-if='item.type==="file"'>
             <a-button type="primary" class="button-text inputWid"
                       @click="clickButtonToUpload(item)">
               {{ (item.dataValue === 'null' || item.dataValue === '' ||
@@ -540,7 +540,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--            中文-->
-            <div v-if="item.controlVerify == '2'">
+            <div v-else-if="item.controlVerify == '2'">
               <a-input class="box-input inputWid"
                        :disabled="item.isLock == '1' ? true: false"
                        :maxLength="1000"
@@ -549,7 +549,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
-            <div v-if="item.controlVerify == '3'">
+            <div v-else-if="item.controlVerify == '3'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -558,7 +558,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--         正浮点书  -->
-            <div v-if="item.controlVerify == '4'">
+            <div v-else-if="item.controlVerify == '4'">
               <a-input class="box-input inputWid"
                        :disabled="item.isLock == '1' ? true: false"
                        onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
@@ -566,7 +566,7 @@
                        v-model="item.dataValue"/>
             </div>
             <!--         整数或小数  -->
-            <div v-if="item.controlVerify == '5'">
+            <div v-else-if="item.controlVerify == '5'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -574,7 +574,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--        一位小数    -->
-            <div v-if="item.controlVerify == '6'">
+            <div v-else-if="item.controlVerify == '6'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -583,7 +583,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            两位小数-->
-            <div v-if="item.controlVerify == '7'">
+            <div v-else-if="item.controlVerify == '7'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -592,7 +592,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            三位小数-->
-            <div v-if="item.controlVerify == '8'">
+            <div v-else-if="item.controlVerify == '8'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -601,7 +601,7 @@
                               v-model="item.dataValue"/>
             </div>
             <!--            四位小数-->
-            <div v-if="item.controlVerify == '9'">
+            <div v-else-if="item.controlVerify == '9'">
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -717,6 +717,7 @@
   .ant-table td {
     white-space: nowrap;
   }
+
   .selectWid .ant-select-selection--multiple {
     overflow: auto;
   }
@@ -724,6 +725,14 @@
   .selectWid .ant-select-selection--multiple::-webkit-scrollbar {
     display: none; /* Chrome Safari */
   }
+
+  .selectWid .ant-select-selection {
+    height: 38px !important;
+    line-height: 38px!important;
+  }
+  .selectWid .ant-select-selection__rendered {
+    line-height: 36px!important;
+  }
 </style>
 <style lang="less" scoped>
   .box {
@@ -742,7 +751,7 @@
   }
 
   .add_flex {
-    display: flex;
+    /*display: flex;*/
   }
 
   /deep/ .box {
@@ -760,11 +769,14 @@
 
   .inputWid {
     min-width: 150px;
+    height: 38px;
+    display: inline-block;
   }
 
   .add-width {
-    width: 33%;
+    width: calc(33.3% - 5px);
     margin-right: 5px;
+    float: left;
   }
 
   .add--number {
@@ -774,9 +786,11 @@
   .ant-input-disabled {
     color: rgba(0, 0, 0, 0.65);
   }
-  .ant-select-disabled{
+
+  .ant-select-disabled {
     color: rgba(0, 0, 0, 0.65);
   }
+
   .itemOption {
     display: inline-block;
     width: 100%;
diff --git a/jero-web/src/components/TaskCutOffTime/index.vue b/jero-web/src/components/TaskCutOffTime/index.vue
index c343426d7..52b1da1ed 100644
--- a/jero-web/src/components/TaskCutOffTime/index.vue
+++ b/jero-web/src/components/TaskCutOffTime/index.vue
@@ -12,7 +12,7 @@
         <a-row :gutter='24'>
           <a-col :span='24'>
             <span style='display: flex;justify-content: center;margin-bottom: 20px;'> <span style='margin-top: 6px;margin-right: 7px'>{{$t('cutoffTime')}}</span>
-                <a-date-picker show-time :placeholder="$t('PleaseSelect')+$t('cutoffTime')" @change="onChange" @ok="onOk" />
+                <a-date-picker :placeholder="$t('PleaseSelect')+$t('cutoffTime')" @change="onChange" @ok="onOk" />
               </span>
           </a-col>
         </a-row>
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index b6b8b2c25..c655dfdc0 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -7,7 +7,7 @@
         rowKey="id"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :pagination="false"
-        :scroll="{x: '100%',y:'calc(100vh - 160px)'}"
+        :scroll="{x: '100%',y:'calc(100vh - 230px)'}"
         :data-source="dataSource"
         :loading="loading"
         sticky
diff --git a/jero-web/src/components/uploadFileChange/file.vue b/jero-web/src/components/uploadFileChange/file.vue
index 1a29bf328..f07c8a165 100644
--- a/jero-web/src/components/uploadFileChange/file.vue
+++ b/jero-web/src/components/uploadFileChange/file.vue
@@ -56,7 +56,7 @@ export default {
     this.containerId = 'container-ty-' + new Date().getTime()
   },
   mounted() {
-    console.log(this.detailDate,'lldetailDate')
+    // console.log(this.detailDate,'lldetailDate')
     let long = localStorage.getItem('language')
     this.cut = ''
     if (long && long == 'zh-cn') {
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index f714583fd..3184fb619 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -75,7 +75,7 @@
               </a-form>
             </div>
           </div>
-          <div class="table-operator">
+          <div class="table-operator" v-if="!this.$route.query.it">
             <!--      // 认证工程师 homo-->
             <!--      // 工程接口人 sdt-->
             <!--      // 填写人 dre-->
@@ -154,6 +154,7 @@
             </div>
             <!--       角色切换   -->
             <div class="operator-text"
+                 v-if="!this.$route.query.it"
                  @click="roleSwitchingClick">
               <a-icon type="select"/>
               {{ $t('roleSwitching') }}
@@ -178,6 +179,7 @@
     </a-modal>
     <!--  冻结配置--->
     <a-modal v-model="areaVisibleFreeze" :title="$t('FreezeConfiguration')" width='600px' :footer="null">
+      <a-spin :spinning="confirmLoading">
       <a-form-model
         class='tag-module'
         ref='ruleForm'
@@ -201,6 +203,7 @@
           </a-col>
         </a-row>
       </a-form-model>
+      </a-spin>
       <div style='padding-left: 60px;color: red'>
         {{$t('Attentionfreeze')}}
       </div>
@@ -461,6 +464,7 @@
         templatetitleId: '',
         rowId: '',
         version: 0,
+        confirmLoading:false,
         itemId: '',
         selectedRowKeysValue: [], // table列表所选得数据
         token: Vue.ls.get(ACCESS_TOKEN),
@@ -851,7 +855,22 @@
         this.areaVisibleFreeze = true
         this.Dateline = {}
         //  获取冻结配置数据
-        this.getFreeze()
+        this.confirmLoading = true
+        this.getFreeze(()=> {
+          this.getLockedConfigIdList()
+        })
+      },
+      getLockedConfigIdList() {
+        getAction('/params/collectManifest/getLockedConfigIdList',
+          { paramsManifestId: this.paramsManifest.id }).then((res) => {
+          if (res.success) {
+            this.Dateline.paramsConfig = res.result
+            this.Dateline = {...this.Dateline}
+          }else{
+            this.Dateline.paramsConfig = []
+          }
+          this.confirmLoading = false
+        })
       },
       // 冻结配置提交
       handleSubmitFreeze() {
@@ -894,7 +913,7 @@
       cancleImportsFreeze() {
         this.areaVisibleFreeze = false
       },
-      getFreeze() {
+      getFreeze(callback) {
         let _this = this
         let param = { paramsManifestId: this.paramsManifest.id, configFlag: 1 }
         axios({
@@ -916,11 +935,15 @@
           .then((res) => {
             if (res.data.success) {
               this.FreezeList = res.data.result
+              callback && callback()
             } else {
               _this.$message.warning(res.data.message)
+              _this.confirmLoading = false
             }
+
           })
           .catch((error) => {
+            _this.confirmLoading = false
           })
       },
       // 下发收集的权限
@@ -1345,7 +1368,19 @@
     }
   }
 </script>
+<style>
+  .popconfirm {
+    z-index: 999;
+  }
 
+  .popconfirm .ant-popover-buttons {
+    display: none !important;
+  }
+
+  .popconfirm .anticon-exclamation-circle {
+    display: none !important;
+  }
+</style>
 <style lang="less" scoped>
   @import '~@assets/less/common.less';
 

From e644205ca2c623cf13330c06188fe22e57ac90a6 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Mon, 4 Jul 2022 11:07:29 +0800
Subject: [PATCH 05/31] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=B8=A6=E5=85=A5=E5=B7=A5?=
 =?UTF-8?q?=E7=A8=8B=E6=8E=A5=E5=8F=A3=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOController.java    | 15 ++++++++
 .../IParamsCollectManifestEOService.java      |  3 ++
 .../ParamsCollectManifestEOServiceImpl.java   | 38 +++++++++++++++++++
 .../controller/ParamsReportEOController.java  |  2 +-
 .../mapper/xml/ParamsReportEOMapper.xml       |  2 +-
 5 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
index 09e668c4a..d4c154ac0 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
@@ -479,6 +479,21 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 		}
 	}
 
+	/**
+	 *  带入工程接口人
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-带入工程接口人")
+	@ApiOperation(value="参数项收集清单-带入工程接口人", notes="参数项收集清单-带入工程接口人")
+	@PostMapping(value = "/bringSdtInto")
+//	@RequiresPermissions("params:collectManifest:bring")
+	public Result<?> bringSdtInto(ParamsCollectManifestVO paramsCollectManifestVO) {
+		paramsCollectManifestEOService.bringSdtInto(paramsCollectManifestVO);
+		return Result.OK("带入工程接口人成功！");
+	}
+
 
 
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
index bdfb056a0..977b46f42 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
@@ -139,4 +139,7 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
 
 	// 同步上报库
 	boolean syncReport(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 带入工程接口人
+	boolean bringSdtInto(ParamsCollectManifestVO paramsCollectManifestVO);
 }
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 7b54bd6f6..5a58faa75 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
@@ -1579,6 +1579,44 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		return isSuccess;
 	}
 
+	@Override
+	public boolean bringSdtInto(ParamsCollectManifestVO paramsCollectManifestVO) {
+		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
+		String projectId = paramsCollectManifestVO.getProjectId();
+
+		// 查询所有收集参数项
+		ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
+		paramsCollectManifestEO.setParamsManifestId(paramsManifestId);
+		List<ParamsCollectManifestEO> list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO);
+		// 过滤出 状态为：待发起收集，且工程接口人处为空的参数项
+		list = list.stream().filter(e-> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState()) && StringUtils.isBlank(e.getSdt())).collect(Collectors.toList());
+
+		List<ParamsCollectManifestEO> updateCollectManifestEOList = new ArrayList<>();
+		if (CollectionUtil.isNotEmpty(list)) {
+			list.forEach(collectManifestEO -> {
+
+				// 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
+				ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(projectId, collectManifestEO.getDutyTerritory());
+				if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) {
+					String sdtId = projectRelatedPersonnel.getEngineeringInterfacePerson();
+					if (org.apache.commons.lang.StringUtils.isNotBlank(sdtId) && !sdtId.contains(",")) { // 领域中仅有一个人时，添加该字段
+						SysUser sysUser = sysUserService.getById(sdtId);
+						if (ObjectUtil.isNotEmpty(sysUser)) {
+							ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
+							updateCollectManifestEO.setId(collectManifestEO.getId());
+							updateCollectManifestEO.setSdt(sysUser.getUsername());
+
+							updateCollectManifestEOList.add(updateCollectManifestEO);
+						}
+					}
+				}
+			});
+
+		}
+
+		return updateBatchById(updateCollectManifestEOList);
+	}
+
 	/**
 	 * 获取一个类和其父类的所有属性
 	 *
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
index 11e698743..6e663cf50 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
@@ -58,7 +58,7 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
 		}
 
 		if (StringUtils.isNotEmpty(paramsReportEO.getTitle())) {
-			paramsReportEO.setProjectName(paramsReportEO.getTitle().replace("%", "\\%"));
+			paramsReportEO.setTitle(paramsReportEO.getTitle().replace("%", "\\%"));
 		}
 
 		IPage page = new Page(pageNo, pageSize);
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml
index 4426e029a..6b84de8f0 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml
@@ -32,7 +32,7 @@
         <where>
             <if test="paramsReportEO != null">
                 <if test="paramsReportEO.title !=null and paramsReportEO.title !=''">
-                    AND title LIKE CONCAT(CONCAT('%',#{paramsReportEO.paramsManifestTitle}),'%')
+                    AND title LIKE CONCAT(CONCAT('%',#{paramsReportEO.title}),'%')
                 </if>
                 <if test="paramsReportEO.projectName !=null and paramsReportEO.projectName !=''">
                     AND project_name LIKE CONCAT(CONCAT('%',#{paramsReportEO.projectName}),'%')

From 2c8b642531a2eb50382486ff54f50ff99a8d9843 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Mon, 4 Jul 2022 11:37:13 +0800
Subject: [PATCH 06/31] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8F=82=E6=95=B0=E9=A1=B9-=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ParamsCollectManifestEOController.java |  2 +-
 .../controller/ParamsReportDetailEOController.java    | 11 ++++++++---
 .../report/mapper/ParamsReportDetailEOMapper.java     |  3 +++
 .../report/mapper/xml/ParamsReportDetailEOMapper.xml  |  7 +++++++
 .../report/service/IParamsReportDetailEOService.java  |  4 +++-
 .../service/impl/ParamsReportDetailEOServiceImpl.java |  9 ++++++---
 6 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
index d4c154ac0..4b1b464df 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
@@ -76,7 +76,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 //	@RequiresPermissions("params:collectManifest:list")
 	public Result<?> queryList(ParamsCollectManifestEO paramsCollectManifestEO,
 							   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-							   @RequestParam(name="pageSize", defaultValue="500") Integer pageSize,
+							   @RequestParam(name="pageSize", defaultValue="100") Integer pageSize,
 							   @RequestParam(name = "cut") String cut) {
 		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) {
 			paramsCollectManifestEO.setNioNumber(paramsCollectManifestEO.getNioNumber().replace("%","\\%"));
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 bf1312780..b13e110ea 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
@@ -1,6 +1,8 @@
 package com.jero.modules.cert.report.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
@@ -62,8 +64,10 @@ public class ParamsReportDetailEOController extends JeroController<ParamsReportD
 	@ApiOperation(value="上报库参数项-列表查询", notes="上报库参数项-列表查询")
 	@GetMapping(value = "/list")
 //	@RequiresPermissions("report:detail:list")
-	public Result<List<Map<String, Object>>> queryList(ParamsReportDetailEO paramsReportDetailEO,
-													   @RequestParam(name = "cut") String cut) {
+	public Result<?> queryList(ParamsReportDetailEO paramsReportDetailEO,
+							   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+							   @RequestParam(name="pageSize", defaultValue="100") Integer pageSize,
+							   @RequestParam(name = "cut") String cut) {
 		if (StringUtils.isNotEmpty(paramsReportDetailEO.getNioNumber())) {
 			paramsReportDetailEO.setNioNumber(paramsReportDetailEO.getNioNumber().replace("%","\\%"));
 		}
@@ -77,7 +81,8 @@ public class ParamsReportDetailEOController extends JeroController<ParamsReportD
 			paramsReportDetailEO.setDre(paramsReportDetailEO.getDre().replace("%","\\%"));
 		}
 
-		List<Map<String, Object>> list = paramsReportDetailEOService.queryList(paramsReportDetailEO, cut);
+		IPage page = new Page(pageNo, pageSize);
+		IPage list = paramsReportDetailEOService.queryList(page, paramsReportDetailEO, cut);
 		return Result.OK(list);
 	}
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java
index ec54aeed7..53781f175 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java
@@ -1,6 +1,7 @@
 package com.jero.modules.cert.report.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
 import com.jero.modules.cert.report.vo.ParamsReportDetailVO;
@@ -19,6 +20,8 @@ public interface ParamsReportDetailEOMapper extends BaseMapper<ParamsReportDetai
 
     List<ParamsReportDetailEO> listInfo(@Param("paramsReportDetailEO") ParamsReportDetailEO paramsReportDetailEO);
 
+    IPage pageInfo(@Param("page") IPage page, @Param("paramsReportDetailEO") ParamsReportDetailEO paramsReportDetailEO);
+
     List<Map<String, Object>> listInfoForExport(@Param("idList") List<String> idList,
                                                 @Param("paramsReportDetailVO") ParamsReportDetailVO paramsReportDetailVO);
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
index 060cf0d4e..b539d2703 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
@@ -91,6 +91,13 @@
         order by nio_number asc, sync_time desc
     </select>
 
+    <select id="pageInfo" resultMap="ParamsReportDetailEOResultMap">
+        select *
+        from params_report_detail
+        <include refid="BaseQuerySql"/>
+        order by nio_number asc, sync_time desc
+    </select>
+
     <select id="listInfoForExport" resultType="java.util.LinkedHashMap">
         select
         prd.id as id,
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 45931c5c2..b9150f5f5 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
@@ -1,5 +1,6 @@
 package com.jero.modules.cert.report.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
 import com.jero.modules.cert.report.vo.ParamsReportDetailVO;
@@ -19,11 +20,12 @@ public interface IParamsReportDetailEOService extends IService<ParamsReportDetai
 
 	/**
 	 * 列表查询
+	 * @param page
 	 * @param paramsReportDetailEO
 	 * @param cut
 	 * @return
 	 */
-	List<Map<String, Object>> queryList(ParamsReportDetailEO paramsReportDetailEO, String cut);
+	IPage queryList(IPage page, ParamsReportDetailEO paramsReportDetailEO, String cut);
 
 	/**
 	 * 列表表头中英文切换
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 8ba990cfa..7a88644e6 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
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ZipUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.jero.common.constant.enums.CutEnum;
@@ -101,10 +102,11 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 	 * @return
 	 */
 	@Override
-	public List<Map<String, Object>> queryList(ParamsReportDetailEO paramsReportDetailEO, String cut) {
+	public IPage queryList(IPage page, ParamsReportDetailEO paramsReportDetailEO, String cut) {
 		String paramsManifestId = paramsReportDetailEO.getParamsManifestId();
 
-		List<ParamsReportDetailEO> list = paramsReportDetailEOMapper.listInfo(paramsReportDetailEO); // 查询固定列
+		IPage pageInfo = paramsReportDetailEOMapper.pageInfo(page, paramsReportDetailEO); // 查询固定列
+		List<ParamsReportDetailEO> list = pageInfo.getRecords(); // 查询固定列
 		List<ParamsReportConfigEO> paramsConfigEOList = paramsReportConfigEOService.queryList(paramsManifestId); // 查询配置列
 
 		// 普通数据字典
@@ -193,7 +195,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 			listMap.add(manifestMap);
 		});
 
-		return listMap;
+		pageInfo.setRecords(listMap);
+		return pageInfo;
 	}
 
 	/**

From 3f91811690205edb7ef927eb5cb877f49db9b2aa Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 4 Jul 2022 11:38:14 +0800
Subject: [PATCH 07/31] =?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/common/lang/en-us.js             |  16 +--
 .../src/components/CollectionType/index.vue   |  15 ++-
 .../components/ReferenceParameter/index.vue   |   8 +-
 .../ParameterItemCollectionList.vue           | 108 ++++++++++++++----
 4 files changed, 105 insertions(+), 42 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 5f80bd61b..49b1d4003 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -942,14 +942,14 @@ module.exports = {
   reportNotUploaded: 'Report not uploaded',
   position: 'position',
 //  认证权限状态
-  CollectionInitiated: 'Collection to be initiated',
-  handledInterface: 'To be handled by the project interface',
-  ReturnedPerson: 'Returned by project contact person',
-  completed: 'To be completed',
-  Filledreturn: 'Filled by return',
-  Submitted: 'Submitted',
-  ReturnedEngineer: 'Returned by Certification Engineer',
-  SynchronizedLibrary: 'Synchronized to the upper reporting Library',
+  CollectionInitiated: 'Wait Collect',
+  handledInterface: 'Wait Sdt',
+  ReturnedPerson: 'Sdt Back',
+  completed: 'Wait Fill',
+  Filledreturn: 'Dre Back',
+  Submitted: 'Submit',
+  ReturnedEngineer: 'Cert Back',
+  SynchronizedLibrary: 'Sync Report',
   Statusis: 'Statusis',
   toHavePermission: 'To Have Permission',
   and: 'and',
diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index f3b7439c7..40d2d66c3 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -28,7 +28,8 @@
               <a-input class="box-input inputWid"
                        :disabled="item.isLock == '1' ? true: false"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
-                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       event.returnValue="false"
+                       onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
@@ -179,9 +180,10 @@
             <div v-else-if="item.controlVerify == '2'">
               <a-input class="box-input inputWid"
                        :maxLength="1000"
+                       event.returnValue="false"
                        :disabled="item.isLock == '1' ? true: false"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
-                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
@@ -274,9 +276,10 @@
             <div v-else-if="item.controlVerify == '2'">
               <a-input class="box-input inputWid"
                        :maxLength="1000"
+                       event.returnValue="false"
                        :disabled="item.isLock == '1' ? true: false"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
-                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
@@ -381,9 +384,10 @@
             <div v-else-if="item.controlVerify == '2'">
               <a-input class="box-input inputWid"
                        :maxLength="1000"
+                       event.returnValue="false"
                        :disabled="item.isLock == '1' ? true: false"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
-                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
@@ -544,8 +548,9 @@
               <a-input class="box-input inputWid"
                        :disabled="item.isLock == '1' ? true: false"
                        :maxLength="1000"
+                       event.returnValue="false"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
-                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
diff --git a/jero-web/src/components/ReferenceParameter/index.vue b/jero-web/src/components/ReferenceParameter/index.vue
index ebaf4c6e5..cdcc74cde 100644
--- a/jero-web/src/components/ReferenceParameter/index.vue
+++ b/jero-web/src/components/ReferenceParameter/index.vue
@@ -81,7 +81,7 @@
         </a-row>
       </a-form-model>
     </a-spin>
-    <div class='drawer-bootom-button'>
+    <div class='drawer-bootom-button' style="margin-top: 4px">
       <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>
       <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>
     </div>
@@ -284,9 +284,9 @@
 <style lang='less' scoped>
   @import '~@assets/less/common.less';
 
-  /deep/ .ant-form-explain {
-    padding-left: 62px;
-  }
+  /*/deep/ .ant-form-explain {*/
+  /*  padding-left: 62px;*/
+  /*}*/
 
   .diolag-area {
     .table-area {
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 3184fb619..5105d2427 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -64,6 +64,26 @@
                                v-model="formInline.dre"></a-input>
                     </div>
                   </a-col>
+                  <a-col :md="6" :sm="8">
+                    <div class="box-title-text">
+                      <div class="title-text" :title="$t('status')">
+                        <span>{{$t('status')}}</span>
+                      </div>
+                      <a-select :placeholder="$t('PleaseSelect')+$t('status')"
+                                class="box-input"
+                                allowClear
+                                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                                v-model="formInline.state">
+                        <a-select-option v-for="(item, key) in statusList"
+                                         :key="key"
+                                         :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name ">
+                           {{ item.name}}
+                     </span>
+                        </a-select-option>
+                      </a-select>
+                    </div>
+                  </a-col>
                   <span style="float: right;overflow: hidden;margin-right: 11px"
                         class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
@@ -180,29 +200,29 @@
     <!--  冻结配置--->
     <a-modal v-model="areaVisibleFreeze" :title="$t('FreezeConfiguration')" width='600px' :footer="null">
       <a-spin :spinning="confirmLoading">
-      <a-form-model
-        class='tag-module'
-        ref='ruleForm'
-        :model='Dateline'
-        :rules='rules'
-        :label-col='labelCol'
-        :wrapper-col='wrapperCol'
-      >
-        <a-row :gutter='24'>
-          <a-col :span='24'>
-            <a-form-model-item ref='region' :label="$t('FreezeConfiguration')" prop='region'>
-              <a-select :placeholder="$t('PleaseSelect')+$t('FreezeConfiguration')" v-model="Dateline.paramsConfig"
-                        allowClear mode="multiple">
-                <a-select-option v-for="(item, key) in FreezeList" :key="key" :value="item.value">
+        <a-form-model
+          class='tag-module'
+          ref='ruleForm'
+          :model='Dateline'
+          :rules='rules'
+          :label-col='labelCol'
+          :wrapper-col='wrapperCol'
+        >
+          <a-row :gutter='24'>
+            <a-col :span='24'>
+              <a-form-model-item ref='region' :label="$t('FreezeConfiguration')" prop='region'>
+                <a-select :placeholder="$t('PleaseSelect')+$t('FreezeConfiguration')" v-model="Dateline.paramsConfig"
+                          allowClear mode="multiple">
+                  <a-select-option v-for="(item, key) in FreezeList" :key="key" :value="item.value">
                     <span style="display: inline-block;width: 100%" :title=" item.label ">
                       {{ item.label }}
                     </span>
-                </a-select-option>
-              </a-select>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+        </a-form-model>
       </a-spin>
       <div style='padding-left: 60px;color: red'>
         {{$t('Attentionfreeze')}}
@@ -387,6 +407,44 @@
       SynchronousSubmissionLibrary
     },
     data() {
+      this.statusList = [
+        {
+          value:'1',
+          name:this.$t('CollectionInitiated')
+        },
+        {
+          value:'2',
+          name:this.$t('handledInterface')
+        },
+        {
+          value:'3',
+          name:this.$t('ReturnedPerson')
+        },
+        {
+          value:'4',
+          name:this.$t('completed')
+        },
+        {
+          value:'5',
+          name:this.$t('Filledreturn')
+        },
+        {
+          value:'6',
+          name:this.$t('Submitted')
+        },
+        {
+          value:'7',
+          name:this.$t('ReturnedEngineer')
+        },
+        {
+          value:'8',
+          name:this.$t('SynchronizedLibrary')
+        },
+        {
+          value:'9',
+          name:this.$t('alteration')
+        }
+      ]
       return {
         // 认证工程师 homo
         // 工程接口人 sdt
@@ -464,7 +522,7 @@
         templatetitleId: '',
         rowId: '',
         version: 0,
-        confirmLoading:false,
+        confirmLoading: false,
         itemId: '',
         selectedRowKeysValue: [], // table列表所选得数据
         token: Vue.ls.get(ACCESS_TOKEN),
@@ -856,7 +914,7 @@
         this.Dateline = {}
         //  获取冻结配置数据
         this.confirmLoading = true
-        this.getFreeze(()=> {
+        this.getFreeze(() => {
           this.getLockedConfigIdList()
         })
       },
@@ -865,8 +923,8 @@
           { paramsManifestId: this.paramsManifest.id }).then((res) => {
           if (res.success) {
             this.Dateline.paramsConfig = res.result
-            this.Dateline = {...this.Dateline}
-          }else{
+            this.Dateline = { ...this.Dateline }
+          } else {
             this.Dateline.paramsConfig = []
           }
           this.confirmLoading = false
@@ -1342,7 +1400,7 @@
                   if (res.data.success) {
                     _this.$message.success(_this.$t('OperationSuccessful'))
                     _this.selectedRowKeys = []
-                    _this.$refs.CollectionTabel.getData()
+                    // _this.$refs.CollectionTabel.getData()
                     _this.$refs.CollectionTabel.getTableList()
                     _this.textLoading = false
                   } else {

From 25f128de5c1a32a241bbf9e202487e074fa52644 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 4 Jul 2022 13:40:28 +0800
Subject: [PATCH 08/31] =?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/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../ParameterItemCollectionList.vue           | 56 +++++++++++++------
 3 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 49b1d4003..ef5169cf6 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1073,4 +1073,5 @@ module.exports = {
   theProjectContactEmpty:'The project contact person of cannot be empty',
   pleaseSelectinitiatedOrRejected:'Please select the data whose list confirmation status is not initiated or rejected',
   TheEngineerAndCertification:'The regulatory engineer and Certification Engineer of cannot be empty',
+  bringInTheProjectInterface:'Bring in the project interface',
 }
\ 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 bc01f7713..2f4e4c60c 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1077,4 +1077,5 @@ module.exports = {
   newNiONumber: 'NIO编号',
   English:'英文',
   requiredParametersEmpty:'必填参数不能为空',
+  bringInTheProjectInterface:'带入工程接口人',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 5105d2427..305256539 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -135,6 +135,10 @@
                   <a-icon type="delete"/>
                   {{$t('BatchDelete')}}
                 </div>
+                <div @click="bringInTheProjectInterfaceClick" class="operator-text-title">
+                  <a-icon type="profile"/>
+                  {{$t('bringInTheProjectInterface')}}
+                </div>
               </template>
               <div class="operator-text" style="position: relative">
                 <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
@@ -409,40 +413,40 @@
     data() {
       this.statusList = [
         {
-          value:'1',
-          name:this.$t('CollectionInitiated')
+          value: '1',
+          name: this.$t('CollectionInitiated')
         },
         {
-          value:'2',
-          name:this.$t('handledInterface')
+          value: '2',
+          name: this.$t('handledInterface')
         },
         {
-          value:'3',
-          name:this.$t('ReturnedPerson')
+          value: '3',
+          name: this.$t('ReturnedPerson')
         },
         {
-          value:'4',
-          name:this.$t('completed')
+          value: '4',
+          name: this.$t('completed')
         },
         {
-          value:'5',
-          name:this.$t('Filledreturn')
+          value: '5',
+          name: this.$t('Filledreturn')
         },
         {
-          value:'6',
-          name:this.$t('Submitted')
+          value: '6',
+          name: this.$t('Submitted')
         },
         {
-          value:'7',
-          name:this.$t('ReturnedEngineer')
+          value: '7',
+          name: this.$t('ReturnedEngineer')
         },
         {
-          value:'8',
-          name:this.$t('SynchronizedLibrary')
+          value: '8',
+          name: this.$t('SynchronizedLibrary')
         },
         {
-          value:'9',
-          name:this.$t('alteration')
+          value: '9',
+          name: this.$t('alteration')
         }
       ]
       return {
@@ -586,6 +590,22 @@
       handleCancelRoleSwitching() {
         this.visibleRoleSwitching = false
       },
+      bringInTheProjectInterfaceClick() {
+        let query = {
+          paramsManifestId: this.paramsManifest.id,
+          projectId: this.$route.query.projectId
+        }
+        this.textLoading = true
+        postAction('/params/collectManifest/bringSdtInto', query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.$refs.CollectionTabel.getTableList()
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+          }
+          this.textLoading = false
+        })
+      },
       handleOkRoleSwitching() {
         this.$refs.ruleFormRoleSwitching.validate(valid => {
           if (valid) {

From cb59cfd7274cb13c03491cace75b427a1c010212 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 4 Jul 2022 13:45:11 +0800
Subject: [PATCH 09/31] =?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/common/lang/en-us.js                             | 1 +
 jero-web/src/common/lang/zh-cn.js                             | 1 +
 .../components/ParameterItemCollectionList.vue                | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index ef5169cf6..973899589 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1074,4 +1074,5 @@ module.exports = {
   pleaseSelectinitiatedOrRejected:'Please select the data whose list confirmation status is not initiated or rejected',
   TheEngineerAndCertification:'The regulatory engineer and Certification Engineer of cannot be empty',
   bringInTheProjectInterface:'Bring in the project interface',
+  theCurrentListSaved:'The current list data has been submitted and cannot be temporarily saved',
 }
\ 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 2f4e4c60c..2aba9452a 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1078,4 +1078,5 @@ module.exports = {
   English:'英文',
   requiredParametersEmpty:'必填参数不能为空',
   bringInTheProjectInterface:'带入工程接口人',
+  theCurrentListSaved:'当前列表数据已全部提交，无法进行暂存',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 305256539..37be07cf5 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -1172,6 +1172,10 @@
               }
             }
           })
+        } else {
+          if (num && num == 1) {
+            this.$message.warning(this.$t('theCurrentListSaved'))
+          }
         }
       },
       // 提交数据

From 1ba10114f357d5cb6dae96bb48e587067b599f50 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Mon, 4 Jul 2022 13:58:46 +0800
Subject: [PATCH 10/31] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=B8=A6=E5=85=A5=E5=B7=A5?=
 =?UTF-8?q?=E7=A8=8B=E6=8E=A5=E5=8F=A3=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/controller/ParamsCollectManifestEOController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
index 4b1b464df..1b3a080a4 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
@@ -487,7 +487,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 	 */
 	@AutoLog(value = "参数项收集清单-带入工程接口人")
 	@ApiOperation(value="参数项收集清单-带入工程接口人", notes="参数项收集清单-带入工程接口人")
-	@PostMapping(value = "/bringSdtInto")
+	@GetMapping(value = "/bringSdtInto")
 //	@RequiresPermissions("params:collectManifest:bring")
 	public Result<?> bringSdtInto(ParamsCollectManifestVO paramsCollectManifestVO) {
 		paramsCollectManifestEOService.bringSdtInto(paramsCollectManifestVO);

From 7d2998cd52726e355bb6c115f8046a2506ea1af6 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 4 Jul 2022 13:59:11 +0800
Subject: [PATCH 11/31] =?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=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/LawsOpinionGatherEOController.java   |  2 ++
 .../entity/LawsOpinionGatherEO.java                 |  3 +++
 .../service/ILawsOpinionGatherEOService.java        |  6 ++++++
 .../impl/LawsOpinionGatherEOServiceImpl.java        | 13 +++++++++++++
 4 files changed, 24 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java
index 922d15e25..0c1c4b174 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java
@@ -53,10 +53,12 @@ public class LawsOpinionGatherEOController extends JeroController<LawsOpinionGat
 	public Result<?> queryPageList(LawsOpinionGatherEO lawsOpinionGatherEO,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   @RequestParam(name="cut", defaultValue="cn") String cut,
 								   HttpServletRequest req) {
 		QueryWrapper<LawsOpinionGatherEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsOpinionGatherEO, req.getParameterMap());
 		Page<LawsOpinionGatherEO> page = new Page<LawsOpinionGatherEO>(pageNo, pageSize);
 		IPage<LawsOpinionGatherEO> pageList = lawsOpinionGatherEOService.page(page, queryWrapper);
+		this.lawsOpinionGatherEOService.disposeData(pageList.getRecords(),cut);
 		return Result.OK(pageList);
 	}
 
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 aa759104e..f3bdee2c6 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
@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -77,6 +78,8 @@ public class LawsOpinionGatherEO implements Serializable {
 	@Excel(name = "收集结果", width = 15)
     @ApiModelProperty(value = "收集结果")
     private String gatherResult;
+	@TableField(exist = false)
+	private String gatherResultShow;
 
 	/**发起日期*/
 	@Excel(name = "发起日期", width = 15, format = "yyyy-MM-dd")
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java
index e1a0cbe59..d3a492c06 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java
@@ -67,4 +67,10 @@ public interface ILawsOpinionGatherEOService extends IService<LawsOpinionGatherE
 	 * @return
 	 */
     Result<?> processCall(JSONObject jsonObject);
+
+	/**
+	 * 处理数据
+	 * @param lawsOpinionGatherEOList
+	 */
+    void disposeData(List<LawsOpinionGatherEO> lawsOpinionGatherEOList,String cut);
 }
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 f1b8735fd..da95056f0 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
@@ -4,10 +4,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
 import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO;
+import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum;
 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 org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import java.util.List;
@@ -124,4 +126,15 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
 		}
 		return new Result<>().success("调用成功！");
 	}
+
+	@Override
+	public void disposeData(List<LawsOpinionGatherEO> lawsOpinionGatherEOList,String cut) {
+		if(CollectionUtils.isNotEmpty(lawsOpinionGatherEOList)){
+			lawsOpinionGatherEOList.forEach(lawsOpinionGather -> {
+				if(StringUtils.isNotEmpty(lawsOpinionGather.getGatherResult())){
+					lawsOpinionGather.setGatherResultShow(GatherResultEnum.getTextByValue(lawsOpinionGather.getGatherResult(),cut));
+				}
+			});
+		}
+	}
 }

From 06877cf2c8086146b336a4e09a6c6dfd1f28a394 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 4 Jul 2022 13:59:12 +0800
Subject: [PATCH 12/31] =?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

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

diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 37be07cf5..71c29c007 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -596,7 +596,7 @@
           projectId: this.$route.query.projectId
         }
         this.textLoading = true
-        postAction('/params/collectManifest/bringSdtInto', query).then((res) => {
+        getAction('/params/collectManifest/bringSdtInto', query).then((res) => {
           if (res.success) {
             this.$message.success(this.$t('OperationSuccessful'))
             this.$refs.CollectionTabel.getTableList()

From 03e3552e8399361f758bf3742fccb25f6f405c8f Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Mon, 4 Jul 2022 14:37:24 +0800
Subject: [PATCH 13/31] =?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-=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89=E9=A1=B9=E8=AF=B7=E6=B1=82=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cert/report/controller/ParamsReportDetailEOController.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java
index b13e110ea..51494c3c4 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
@@ -103,7 +103,7 @@ public class ParamsReportDetailEOController extends JeroController<ParamsReportD
 	 */
 	@AutoLog(value = "上报库参数项-配置下拉选项(常规导出)")
 	@ApiOperation(value="上报库参数项-配置下拉选项(常规导出)", notes="上报库参数项-配置下拉选项(常规导出)")
-	@PostMapping(value = "/getConfigLabelList")
+	@GetMapping(value = "/getConfigLabelList")
 //	@RequiresPermissions("report:detail:export:normal")
 	public Result<?> getConfigLableList(ParamsReportDetailVO paramsReportDetailVO) {
 		List<Map<String, String>> configLabelList = paramsReportDetailEOService.getConfigLabelList(paramsReportDetailVO);

From a71e10b7944016bf4e1ccb6ce96ac73182feeedb Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 4 Jul 2022 15:31:32 +0800
Subject: [PATCH 14/31] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=9C=88=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   3 +
 jero-web/src/common/lang/zh-cn.js             |   3 +
 .../components/RegulationMonthlyFill.vue      |  32 ++-
 .../components/modules/defaultTemplate.vue    | 191 ++++++++++++++----
 .../components/modules/fillAdd.vue            | 170 +++++++++++-----
 .../components/modules/fillTableAdd.vue       |   4 +-
 .../components/modules/releaseStandard.vue    |  48 ++++-
 .../components/modules/solicitOpinions.vue    |  48 +++--
 8 files changed, 374 insertions(+), 125 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 973899589..8949aa8bf 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1075,4 +1075,7 @@ module.exports = {
   TheEngineerAndCertification:'The regulatory engineer and Certification Engineer of cannot be empty',
   bringInTheProjectInterface:'Bring in the project interface',
   theCurrentListSaved:'The current list data has been submitted and cannot be temporarily saved',
+  defaultTemplate:'Default template',
+  newRequestCommentListTemplate:'New request for comment list template',
+  NewReleasedStandardTemplate:'New released standard template',
 }
\ 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 2aba9452a..f02aaedd0 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1079,4 +1079,7 @@ module.exports = {
   requiredParametersEmpty:'必填参数不能为空',
   bringInTheProjectInterface:'带入工程接口人',
   theCurrentListSaved:'当前列表数据已全部提交，无法进行暂存',
+  defaultTemplate:'默认模板',
+  newRequestCommentListTemplate:'新征求意见清单模板',
+  NewReleasedStandardTemplate:'新发布标准模板',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue
index c57c1a2da..466f3f69a 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue
@@ -90,7 +90,8 @@
       return {
         //url传参严格按照当前命名
         url: {
-          deleteBatch: ''
+          deleteBatch: '/report/lawsMonthlyReportWriteEO/deleteBatch',
+          list:'/report/lawsMonthlyReportWriteEO/page',
         },
         loading: false,
         dataSource: [],
@@ -103,7 +104,7 @@
           {
             title: this.$t('chapterContents'),
             align: 'center',
-            dataIndex: 'chapterContents',
+            dataIndex: 'memoriesChapterName',
             width: 170
           },
           {
@@ -124,21 +125,21 @@
             align: 'center',
             width: 170,
             ellipsis: true,
-            dataIndex: 'regulatoryContact'
+            dataIndex: 'lawsContact'
           },
           {
             title: this.$t('completedBy'),
             align: 'center',
             ellipsis: true,
             width: 170,
-            dataIndex: 'completedBy'
+            dataIndex: 'createBy'
           },
           {
             title: this.$t('exportStatus'),
             align: 'center',
             ellipsis: true,
             width: 170,
-            dataIndex: 'exportStatus'
+            dataIndex: 'exportStateName'
           },
           {
             title: this.$t('operation'),
@@ -183,7 +184,26 @@
         this.getList()
       },
       getList() {
-
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...this.queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = res.result.current - 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
       },
       monthlyTitleTemplateClick() {
         this.$refs.fillTableRef.getData()
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
index 1fb8577ec..80632e53a 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
@@ -7,10 +7,10 @@
               <span class="title-text-text"
                     :title="$t('title')">{{$t('title')}}</span>
           </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="titleCn">
             <a-input class="box-input"
                      :disabled="false"
-                     v-model="formInline.title"
+                     v-model="formInline.titleCn"
                      :placeholder="$t('PleaseEnter')+$t('title')"/>
           </a-form-model-item>
         </div>
@@ -21,10 +21,10 @@
               <span class="title-text-text"
                     :title="$t('englishTitle')">{{$t('englishTitle')}}</span>
           </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="titleEn">
             <a-input class="box-input"
                      :disabled="false"
-                     v-model="formInline.englishTitle"
+                     v-model="formInline.titleEn"
                      :placeholder="$t('PleaseEnter')+$t('englishTitle')"/>
           </a-form-model-item>
         </div>
@@ -59,7 +59,7 @@
                     :title="$t('vehicleType')">{{$t('vehicleType')}}</span>
           </div>
           <a-form-model-item class="itemModel-multi">
-            <j-multi-select-tag class="box-input" v-model="formInline.vehicleType"
+            <j-multi-select-tag class="box-input" v-model="formInline.applyCar"
                                 :placeholder="$t('PleaseSelect')+$t('vehicleType')"
                                 :type="'select'"
                                 :triggerChange="false" :dictCode="'car_type'"/>
@@ -75,7 +75,7 @@
                       :title="$t('scopeOfApplication')">{{$t('scopeOfApplication')}}</span>
           </div>
           <a-form-model-item class="itemModel-multi">
-            <j-multi-select-tag class="box-input" v-model="formInline.shi4_yong4_fan4_wei2"
+            <j-multi-select-tag class="box-input" v-model="formInline.applyScope"
                                 :placeholder="$t('PleaseSelect')+$t('scopeOfApplication')"
                                 :type="'select'"
                                 :triggerChange="false" :dictCode="'apply_scope'"/>
@@ -89,7 +89,7 @@
                     :title="$t('status')">{{$t('status')}}</span>
           </div>
           <a-form-model-item class="itemModel">
-            <j-dict-select-tag class="box-input" v-model="formInline.status"
+            <j-dict-select-tag class="box-input" v-model="formInline.state"
                                @input="handleInput('status')"
                                :placeholder="$t('PleaseSelect')+$t('status')"
                                :type="'select'"
@@ -106,11 +106,11 @@
                     :title="$t('usage')">{{$t('usage')}}</span>
           </div>
           <a-form-model-item class="itemModel">
-            <j-dict-select-tag class="box-input" v-model="formInline.usage"
+            <j-dict-select-tag class="box-input" v-model="formInline.useMethod"
                                @input="handleInput('usage')"
                                :placeholder="$t('PleaseSelect')+$t('usage')"
                                :type="'select'"
-                               :triggerChange="false" :dictCode="'usage'"/>
+                               :triggerChange="false" :dictCode="'yong4_fa3'"/>
           </a-form-model-item>
         </div>
       </a-col>
@@ -120,10 +120,10 @@
                 <span class="title-text-text"
                       :title="$t('implementationModel')">{{$t('implementationModel')}}</span>
           </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="implementCar">
             <a-input class="box-input"
                      :disabled="disabled"
-                     v-model="formInline.implementationModel"
+                     v-model="formInline.implementCar"
                      :placeholder="$t('PleaseEnter')+$t('implementationModel')"/>
           </a-form-model-item>
         </div>
@@ -136,10 +136,10 @@
                 <span class="title-text-text"
                       :title="$t('releaseDate')">{{$t('releaseDate')}}</span>
           </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="issueTime">
             <a-input class="box-input"
                      :disabled="disabled"
-                     v-model="formInline.releaseDate"
+                     v-model="formInline.issueTime"
                      :placeholder="$t('PleaseEnter')+$t('releaseDate')"/>
           </a-form-model-item>
         </div>
@@ -150,10 +150,10 @@
                 <span class="title-text-text"
                       :title="$t('ImplementationDate')">{{$t('ImplementationDate')}}</span>
           </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="newCarImplementTime">
             <a-input class="box-input"
                      :disabled="disabled"
-                     v-model="formInline.ImplementationDate"
+                     v-model="formInline.newCarImplementTime"
                      :placeholder="$t('PleaseEnter')+$t('ImplementationDate')"/>
           </a-form-model-item>
         </div>
@@ -166,10 +166,10 @@
                 <span class="title-text-text"
                       :title="$t('vehicleInProductionDate')">{{$t('vehicleInProductionDate')}}</span>
           </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="productionCarImplementTime">
             <a-input class="box-input"
                      :disabled="disabled"
-                     v-model="formInline.vehicleInProductionDate"
+                     v-model="formInline.productionCarImplementTime"
                      :placeholder="$t('PleaseEnter')+$t('vehicleInProductionDate')"/>
           </a-form-model-item>
         </div>
@@ -181,10 +181,10 @@
           <div class="title-text">
             <span class="title-text-text" :title="$t('primaryCoverageCn')">{{$t('primaryCoverageCn')}}</span>
           </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="contentCn">
             <a-textarea
               :placeholder="$t('PleaseEnter')+$t('primaryCoverageCn')"
-              v-model.trim="formInline.useExplain" :rows="4"/>
+              v-model.trim="formInline.contentCn" :rows="4"/>
           </a-form-model-item>
         </div>
       </a-col>
@@ -195,10 +195,10 @@
           <div class="title-text">
             <span class="title-text-text" :title="$t('primaryCoverageEn')">{{$t('primaryCoverageEn')}}</span>
           </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="contentEn">
             <a-textarea
               :placeholder="$t('PleaseEnter')+$t('primaryCoverageEn')"
-              v-model.trim="formInline.useExplain" :rows="4"/>
+              v-model.trim="formInline.contentEn" :rows="4"/>
           </a-form-model-item>
         </div>
       </a-col>
@@ -209,10 +209,10 @@
           <div class="title-text">
             <span class="title-text-text" :title="$t('workProgressCn')">{{$t('workProgressCn')}}</span>
           </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="workProgressCn">
             <a-textarea
               :placeholder="$t('PleaseEnter')+$t('workProgressCn')"
-              v-model.trim="formInline.useExplain" :rows="4"/>
+              v-model.trim="formInline.workProgressCn" :rows="4"/>
           </a-form-model-item>
         </div>
       </a-col>
@@ -223,10 +223,10 @@
           <div class="title-text">
             <span class="title-text-text" :title="$t('workProgressEn')">{{$t('workProgressEn')}}</span>
           </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="workProgressEn">
             <a-textarea
               :placeholder="$t('PleaseEnter')+$t('workProgressEn')"
-              v-model.trim="formInline.useExplain" :rows="4"/>
+              v-model.trim="formInline.workProgressEn" :rows="4"/>
           </a-form-model-item>
         </div>
       </a-col>
@@ -238,10 +238,11 @@
             <span class="title-text-text" :title="$t('regulatoryContact')">{{$t('regulatoryContact')}}</span>
           </div>
           <a-form-model-item class="itemModel">
-            <a-input class="box-input"
-                     :disabled="false"
-                     v-model="formInline.regulatoryContact"
-                     :placeholder="$t('PleaseEnter')+$t('regulatoryContact')"/>
+            <PersonnelSelection
+              :query="{db_field_name:'lawsContact',db_field_txt:$t('regulatoryContact')}"
+              :personneQuery="formInline"
+              @change="PersonnelSelectionChange"
+              v-model="formInline.lawsContactName"/>
           </a-form-model-item>
         </div>
       </a-col>
@@ -252,7 +253,7 @@
           <div class="title-text">
             <span class="title-text-text" :title="$t('link')">{{$t('link')}}</span>
           </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="link">
             <a-input class="box-input"
                      :disabled="false"
                      v-model="formInline.link"
@@ -265,32 +266,93 @@
 </template>
 
 <script>
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import { mapGetters } from 'vuex'
+  import { getAction, postAction, downloadFile } from '@/api/manage'
+
   export default {
     name: 'defaultTemplate',
+    props: ['formInlineQuery'],
+    components: {
+      PersonnelSelection
+    },
     data() {
       return {
         rules: {
-          name: [
-            {
-              required: true,
-              message: this.$t('VirtualListName') + this.$t('cannotEmpty'),
-              trigger: 'blur'
-            },
+          titleCn: [
             {
               max: 100,
-              message: this.$t('VirtualListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              message: this.$t('title') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
               trigger: 'blur'
             }
           ],
-          useExplain: [
+          titleEn: [
             {
-              required: true,
-              message: this.$t('instructionForUse') + this.$t('cannotEmpty'),
+              max: 100,
+              message: this.$t('englishTitle') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
               trigger: 'blur'
-            },
+            }
+          ],
+          productionCarImplementTime: [
             {
-              max: 500,
-              message: this.$t('instructionForUse') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
+              max: 100,
+              message: this.$t('vehicleInProductionDate') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          newCarImplementTime: [
+            {
+              max: 100,
+              message: this.$t('ImplementationDate') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          issueTime: [
+            {
+              max: 100,
+              message: this.$t('releaseDate') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          implementCar: [
+            {
+              max: 100,
+              message: this.$t('implementationModel') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          link: [
+            {
+              max: 100,
+              message: this.$t('link') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          workProgressEn: [
+            {
+              max: 300,
+              message: this.$t('workProgressEn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          workProgressCn: [
+            {
+              max: 300,
+              message: this.$t('workProgressEn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          contentEn: [
+            {
+              max: 300,
+              message: this.$t('primaryCoverageEn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          contentCn: [
+            {
+              max: 300,
+              message: this.$t('primaryCoverageCn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
               trigger: 'blur'
             }
           ]
@@ -301,14 +363,55 @@
       }
     },
     mounted() {
-
+      this.getSysCategoryTree()
+      this.$nextTick(() => {
+        if (this.formInlineQuery.id) {
+          this.formInline = JSON.parse(JSON.stringify(this.formInlineQuery))
+          if(this.formInline.technologyTerritory){
+            this.formInline.technologyTerritory = this.formInline.technologyTerritory.split(',')
+          }
+          this.formInline = { ...this.formInline }
+        } else {
+          this.formInline = {}
+          this.formInline.lawsContactName = this.userInfo().username
+          this.formInline.lawsContact = this.userInfo().id
+          this.formInline = { ...this.formInline }
+        }
+      })
     },
     methods: {
+      ...mapGetters(['userInfo']),
+      getSysCategoryTree() {
+        getAction('/sys/category/getSysCategoryTree', {}).then((res) => {
+          if (res.success) {
+            this.CategoryTreeList = res.result
+          } else {
+            this.CategoryTreeList = []
+          }
+        })
+      },
       handleInput(value) {
         this.$nextTick(() => {
           this.formInline = { ...this.formInline }
           this.$refs.ruleForm.validateField([value])
         })
+      },
+      PersonnelSelectionChange(value, id) {
+        this.formInline[value] = id
+        this.formInline = { ...this.formInline }
+      },
+      getData(callback) {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            let formInline = JSON.parse(JSON.stringify(this.formInline))
+            Object.keys(formInline).forEach(res => {
+              if (formInline[res] && formInline[res] instanceof Array) {
+                formInline[res] = formInline[res].join(',')
+              }
+            })
+            callback && callback(formInline)
+          }
+        })
       }
     }
   }
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 0725fd8db..ec843792e 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue
@@ -15,12 +15,13 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-              <span class="title-text-text"
-                    :title="$t('fillInTheMonth')">{{$t('fillInTheMonth')}}</span>
+                  <span class="Required">*</span>
+                  <span class="title-text-text"
+                        :title="$t('fillInTheMonth')">{{$t('fillInTheMonth')}}</span>
                 </div>
-                <a-form-model-item class="itemModel">
+                <a-form-model-item class="itemModel" prop="month">
                   <a-month-picker class="box-input"
-                                  v-model="formInline.fillInTheMonth"
+                                  v-model="formInline.month"
                                   :placeholder="$t('fillInTheMonth')"/>
                 </a-form-model-item>
               </div>
@@ -35,34 +36,33 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-              <span class="title-text-text"
-                    :title="$t('chapterContents')">{{$t('chapterContents')}}</span>
+                  <span class="Required">*</span>
+                  <span class="title-text-text"
+                        :title="$t('chapterContents')">{{$t('chapterContents')}}</span>
                 </div>
-                <a-form-model-item class="itemModel">
-                  <a-select :placeholder="$t('PleaseSelect')+$t('chapterContents')"
-                            :disabled="disabled"
-                            class="box-input"
-                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                            allowClear
-                            v-model="formInline.chapterContents">
-                    <a-select-option v-for="(item, key) in chapterContentsList"
-                                     :key="key"
-                                     :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.name ">
-                           {{ item.name }}
-                     </span>
-                    </a-select-option>
-                  </a-select>
+                <a-form-model-item class="itemModel-multi" prop="memoriesChapter">
+                  <a-tree-select
+                    tree-node-filter-prop="title"
+                    v-model="formInline.memoriesChapter"
+                    :maxTagCount="1"
+                    :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                    class="box-input"
+                    style="width: 100%"
+                    :tree-data="chapterContentsList"
+                    tree-checkable
+                    :placeholder="$t('PleaseSelect')+$t('chapterContents')"
+                  />
                 </a-form-model-item>
               </div>
             </a-col>
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-              <span class="title-text-text"
-                    :title="$t('contentTemplate')">{{$t('contentTemplate')}}</span>
+                  <span class="Required">*</span>
+                  <span class="title-text-text"
+                        :title="$t('contentTemplate')">{{$t('contentTemplate')}}</span>
                 </div>
-                <a-form-model-item class="itemModel">
+                <a-form-model-item class="itemModel" prop="contentTemplate">
                   <a-select :placeholder="$t('PleaseSelect')+$t('contentTemplate')"
                             :disabled="disabled"
                             class="box-input"
@@ -81,9 +81,12 @@
               </div>
             </a-col>
           </a-row>
-          <defaultTemplate v-if="formInline.contentTemplate == 1"/>
-          <solicitOpinions v-else-if="formInline.contentTemplate == 2"/>
-          <releaseStandard v-else-if="formInline.contentTemplate == 3"/>
+          <defaultTemplate :formInlineQuery="formInline" ref="defaultTemplateRef"
+                           v-if="formInline.contentTemplate == '1'"/>
+          <solicitOpinions :formInlineQuery="formInline " ref="solicitOpinionsRef"
+                           v-else-if="formInline.contentTemplate == '2'"/>
+          <releaseStandard :formInlineQuery="formInline" ref="releaseStandardRef"
+                           v-else-if="formInline.contentTemplate == '3'"/>
         </a-form-model>
       </a-spin>
       <div class="drawer-bootom-button">
@@ -98,6 +101,7 @@
   import defaultTemplate from './defaultTemplate'
   import solicitOpinions from './solicitOpinions'
   import releaseStandard from './releaseStandard'
+  import { getAction, postAction, downloadFile } from '@/api/manage'
 
   export default {
     name: 'fillAdd',
@@ -109,28 +113,25 @@
     data() {
       return {
         rules: {
-          name: [
+          month: [
             {
               required: true,
-              message: this.$t('VirtualListName') + this.$t('cannotEmpty'),
-              trigger: 'blur'
-            },
-            {
-              max: 100,
-              message: this.$t('VirtualListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
-              trigger: 'blur'
+              message: this.$t('fillInTheMonth') + this.$t('cannotEmpty'),
+              trigger: 'change'
             }
           ],
-          useExplain: [
+          memoriesChapter: [
             {
               required: true,
-              message: this.$t('instructionForUse') + this.$t('cannotEmpty'),
-              trigger: 'blur'
-            },
+              message: this.$t('chapterContents') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          contentTemplate: [
             {
-              max: 500,
-              message: this.$t('instructionForUse') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
-              trigger: 'blur'
+              required: true,
+              message: this.$t('contentTemplate') + this.$t('cannotEmpty'),
+              trigger: 'change'
             }
           ]
         },
@@ -142,40 +143,66 @@
         chapterContentsList: [],
         contentTemplateList: [
           {
-            id: 1,
-            text: '默认模板'
+            id: '1',
+            text: this.$t('defaultTemplate')
           },
           {
-            id: 2,
-            text: '新征求意见清单模板'
+            id: '2',
+            text: this.$t('newRequestCommentListTemplate')
           },
           {
-            id: 3,
-            text: '新发布标准模板'
+            id: '3',
+            text: this.$t('NewReleasedStandardTemplate')
           }
-        ]
+        ],
+        url: {
+          add: '/report/lawsMonthlyReportWriteEO/add',
+          edit: '/report/lawsMonthlyReportWriteEO/edit',
+          queryById: '/report/lawsMonthlyReportWriteEO/queryById'
+        }
       }
     },
     mounted() {
     },
     methods: {
+      getTree() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: 1000
+        }
+        getAction('/report/lawsMonthlyReportTitleTemplateEO/page', query).then((res) => {
+          if (res.success) {
+            this.chapterContentsList = res.result.records || []
+            this.chapterContentsList.forEach(res => {
+
+            })
+          } else {
+            this.chapterContentsList = []
+          }
+        })
+      },
       add() {
+        this.getTree()
         this.title = this.$t('addContent')
         this.visible = true
         this.disabled = false
         this.$nextTick(() => {
           this.formInline = {}
-          this.formInline.contentTemplate = 1
+          this.formInline.contentTemplate = '1'
           this.formInline = { ...this.formInline }
           this.$refs.ruleForm.clearValidate()
         })
       },
       edit(row) {
+        this.getTree()
         this.title = this.$t('editContent')
         this.visible = true
         this.disabled = false
         this.$nextTick(() => {
           this.formInline = row
+          if (this.formInline.memoriesChapter) {
+            this.formInline.memoriesChapter = this.formInline.memoriesChapter.split(',')
+          }
           this.$refs.ruleForm.clearValidate()
         })
       },
@@ -192,7 +219,50 @@
         this.visible = false
       },
       handleSubmit() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            let text = ''
+            if (this.$refs.defaultTemplateRef) {
+              text = 'defaultTemplateRef'
+            } else if (this.$refs.solicitOpinionsRef) {
+              text = 'solicitOpinionsRef'
+            } else if (this.$refs.releaseStandardRef) {
+              text = 'releaseStandardRef'
+            }
+            this.$refs[text].getData((val) => {
+              this.confirmLoading = true
+              let url = ''
+              if (this.formInline.id) {
+                url = this.url.edit
+              } else {
+                url = this.url.add
+              }
+              let formInline = JSON.parse(JSON.stringify(this.formInline))
+              Object.keys(formInline).forEach(res => {
+                if (formInline[res] && formInline[res] instanceof Array) {
+                  formInline[res] = formInline[res].join(',')
+                }
+              })
+              let query = Object.assign(val, {
+                month: formInline.month,
+                memoriesChapter: formInline.memoriesChapter,
+                contentTemplate: formInline.contentTemplate
+              })
 
+              postAction(url, query).then((res) => {
+                if (res.success) {
+                  this.$message.success(this.$t('OperationSuccessful'))
+                  this.visible = false
+                  this.confirmLoading = false
+                  this.$emit('fillTableAddForm')
+                } else {
+                  this.confirmLoading = false
+                  this.$message.warning(this.$t('operationFailed'))
+                }
+              })
+            })
+          }
+        })
       }
     }
   }
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue
index 3c1c69430..d33391169 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue
@@ -53,8 +53,8 @@
                   <a-select-option v-for="(item, key) in ParentList"
                                    :key="item.id"
                                    :value="item.id">
-                     <span style="display: inline-block;width: 100%" :title="item.title ">
-                           {{ item.title }}
+                     <span style="display: inline-block;width: 100%" :title="item.titleCn ">
+                           {{ item.titleCn }}
                      </span>
                   </a-select-option>
                 </a-select>
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue
index f41cd3e9d..fa1db7980 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue
@@ -21,7 +21,7 @@
             <a-form-model-item class="itemModel" prop="standardNo">
               <a-input class="box-input"
                        :disabled="false"
-                       v-model="formInline.standardNo"
+                       v-model="formInline.standardNumber"
                        :placeholder="$t('PleaseEnter')+$t('standardNo')"/>
             </a-form-model-item>
           </div>
@@ -63,10 +63,10 @@
             <a-form-model-item class="itemModel">
               <a-date-picker class="box-input"
                              :placeholder="$t('PleaseSelect')+$t('releaseDate')"
-                             @change="dateChange('releaseDate')"
+                             @change="dateChange('issueTime',index)"
                              :getCalendarContainer="(trigger) => trigger.parentNode"
                              format="YYYY-MM-DD"
-                             v-model="formInline['releaseDate']"
+                             v-model="formInline['issueTime']"
                              :disabled="disabled"
                              style="width: 100%"/>
             </a-form-model-item>
@@ -82,10 +82,10 @@
             <a-form-model-item class="itemModel">
               <a-date-picker class="box-input"
                              :placeholder="$t('PleaseSelect')+$t('implemenDate')"
-                             @change="dateChange('implemenDate')"
+                             @change="dateChange('implementTime',index)"
                              :getCalendarContainer="(trigger) => trigger.parentNode"
                              format="YYYY-MM-DD"
-                             v-model="formInline['implemenDate']"
+                             v-model="formInline['implementTime']"
                              :disabled="disabled"
                              style="width: 100%"/>
             </a-form-model-item>
@@ -101,19 +101,34 @@
 
   export default {
     name: 'releaseStandard',
+    props:['formInlineQuery'],
     data() {
       return {
         rules: {},
         formInline: {},
         CategoryTreeList: [],
         disabled: false,
-        dataList: [
-          { id: 1 }
-        ]
+        dataList: []
       }
     },
     mounted() {
-
+      this.$nextTick(() => {
+        if (this.formInlineQuery.id) {
+          this.formInline = JSON.parse(JSON.stringify(this.formInlineQuery))
+          this.formInline = { ...this.formInline }
+        } else {
+          this.dataList = [
+            {
+              standardNumber: '',
+              standardNameCn: '',
+              standardNameEn: '',
+              issueTime: '',
+              implementTime:'',
+            }
+          ]
+          this.dataList = [...this.dataList]
+        }
+      })
     },
     methods: {
       handleInput(value) {
@@ -124,7 +139,11 @@
       },
       addData() {
         this.dataList.push({
-          id: 2
+          standardNumber: '',
+          standardNameCn: '',
+          standardNameEn: '',
+          issueTime: '',
+          implementTime:'',
         })
         this.dataList = [...this.dataList]
       },
@@ -133,7 +152,14 @@
         this.dataList = [...this.dataList]
       },
       dateChange(item) {
-        this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : ''
+        this.dataList[index][item] = this.dataList[index][item] ? moment(this.dataList[index][item]).format('YYYY-MM-DD') : ''
+      },
+      getData(callback) {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            callback && callback(this.formInline)
+          }
+        })
       }
     }
   }
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/solicitOpinions.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/solicitOpinions.vue
index c0385f279..d4a932d2e 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/solicitOpinions.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/solicitOpinions.vue
@@ -21,7 +21,7 @@
             <a-form-model-item class="itemModel" prop="planNoChinese">
               <a-input class="box-input"
                        :disabled="false"
-                       v-model="formInline.planNoChinese"
+                       v-model="item.planNumberCn"
                        :placeholder="$t('PleaseEnter')+$t('planNoChinese')"/>
             </a-form-model-item>
           </div>
@@ -35,7 +35,7 @@
             <a-form-model-item class="itemModel" prop="standardNameCn">
               <a-input class="box-input"
                        :disabled="false"
-                       v-model="formInline.standardNameCn"
+                       v-model="item.standardNameCn"
                        :placeholder="$t('PleaseEnter')+$t('standardNameCn')"/>
             </a-form-model-item>
           </div>
@@ -50,7 +50,7 @@
             <a-form-model-item class="itemModel">
               <a-input class="box-input"
                        :disabled="false"
-                       v-model="formInline.standardNameEn"
+                       v-model="item.standardNameEn"
                        :placeholder="$t('PleaseEnter')+$t('standardNameEn')"/>
             </a-form-model-item>
           </div>
@@ -63,10 +63,10 @@
             <a-form-model-item class="itemModel">
               <a-date-picker class="box-input"
                              :placeholder="$t('PleaseSelect')+$t('deadlineForComments')"
-                             @change="dateChange('deadlineForComments')"
+                             @change="dateChange('expirationDate',index)"
                              :getCalendarContainer="(trigger) => trigger.parentNode"
                              format="YYYY-MM-DD"
-                             v-model="formInline['deadlineForComments']"
+                             v-model="item['expirationDate']"
                              :disabled="disabled"
                              style="width: 100%"/>
             </a-form-model-item>
@@ -82,19 +82,33 @@
 
   export default {
     name: 'solicitOpinions',
+    props: ['formInlineQuery'],
     data() {
       return {
         rules: {},
         formInline: {},
         CategoryTreeList: [],
         disabled: false,
-        dataList: [
-          { id: 1 }
-        ]
+        dataList: []
       }
     },
     mounted() {
-
+      this.$nextTick(() => {
+        if (this.formInlineQuery.id) {
+          this.formInline = JSON.parse(JSON.stringify(this.formInlineQuery))
+          this.formInline = { ...this.formInline }
+        } else {
+          this.dataList = [
+            {
+              planNumberCn: '',
+              standardNameCn: '',
+              standardNameEn: '',
+              expirationDate: ''
+            }
+          ]
+          this.dataList = [...this.dataList]
+        }
+      })
     },
     methods: {
       handleInput(value) {
@@ -105,7 +119,10 @@
       },
       addData() {
         this.dataList.push({
-          id: 2
+          planNumberCn: '',
+          standardNameCn: '',
+          standardNameEn: '',
+          expirationDate: ''
         })
         this.dataList = [...this.dataList]
       },
@@ -113,8 +130,15 @@
         this.dataList.pop()
         this.dataList = [...this.dataList]
       },
-      dateChange(item) {
-        this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : ''
+      dateChange(item, index) {
+        this.dataList[index][item] = this.dataList[index][item] ? moment(this.dataList[index][item]).format('YYYY-MM-DD') : ''
+      },
+      getData(callback) {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            callback && callback(this.formInline)
+          }
+        })
       }
     }
   }

From a2b6a30f7f3118f7502028e17690be8aababa8b5 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 4 Jul 2022 15:34:17 +0800
Subject: [PATCH 15/31] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=9C=88=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue
index fa1db7980..914e4e057 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/releaseStandard.vue
@@ -151,7 +151,7 @@
         this.dataList.pop()
         this.dataList = [...this.dataList]
       },
-      dateChange(item) {
+      dateChange(item,index) {
         this.dataList[index][item] = this.dataList[index][item] ? moment(this.dataList[index][item]).format('YYYY-MM-DD') : ''
       },
       getData(callback) {

From deb243daf903e5d513d6447b3e85b0e22ee76d28 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Mon, 4 Jul 2022 15:44:49 +0800
Subject: [PATCH 16/31] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=93-=E5=AF=BC=E5=87=BA=E5=8E=86=E5=8F=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ParamsReportEOController.java  |  36 ++++++
 .../entity/ParamsReportExportHistoryEO.java   |  98 ++++++++++++++
 .../cert/report/enums/ExportTypeEnum.java     |  59 +++++++++
 .../ParamsReportExportHistoryEOMapper.java    |  19 +++
 .../xml/ParamsReportExportHistoryEOMapper.xml |  60 +++++++++
 .../IParamsReportExportHistoryEOService.java  |  64 +++++++++
 .../impl/ParamsReportDetailEOServiceImpl.java |  23 +++-
 ...aramsReportExportHistoryEOServiceImpl.java | 122 ++++++++++++++++++
 .../oss/service/impl/OSSFileServiceImpl.java  |  15 ++-
 9 files changed, 494 insertions(+), 2 deletions(-)
 create mode 100644 jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportExportHistoryEO.java
 create mode 100644 jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java
 create mode 100644 jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java
 create mode 100644 jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml
 create mode 100644 jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java
 create mode 100644 jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportExportHistoryEOServiceImpl.java

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
index 6e663cf50..1ba513ce4 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
@@ -6,7 +6,9 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.modules.cert.report.entity.ParamsReportEO;
+import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO;
 import com.jero.modules.cert.report.service.IParamsReportEOService;
+import com.jero.modules.cert.report.service.IParamsReportExportHistoryEOService;
 import com.jero.modules.system.util.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -35,6 +37,9 @@ import java.util.List;
 public class ParamsReportEOController extends JeroController<ParamsReportEO, IParamsReportEOService> {
 	@Autowired
 	private IParamsReportEOService paramsReportEOService;
+
+	@Autowired
+	private IParamsReportExportHistoryEOService paramsReportExportHistoryEOService;
 	
 	/**
 	 * 分页列表查询
@@ -66,6 +71,37 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
 		return Result.OK(pageList);
 	}
 
+	/**
+	 * 分页列表查询
+	 *
+	 * @param paramsReportExportHistoryEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 */
+	@AutoLog(value = "上报库-导出历史分页查询")
+	@ApiOperation(value="上报库-导出历史分页查询", notes="上报库-导出历史分页查询")
+	@GetMapping(value = "/exportHistoryPage")
+//	@RequiresPermissions("params:report:history")
+	public Result<?> exportHistoryPage(ParamsReportExportHistoryEO paramsReportExportHistoryEO,
+									   @RequestParam(name="cut") String cut,
+									   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+		if (StringUtils.isNotEmpty(paramsReportExportHistoryEO.getProjectName())) {
+			paramsReportExportHistoryEO.setProjectName(paramsReportExportHistoryEO.getProjectName().replace("%", "\\%"));
+		}
+
+		if (StringUtils.isNotEmpty(paramsReportExportHistoryEO.getTitle())) {
+			paramsReportExportHistoryEO.setTitle(paramsReportExportHistoryEO.getTitle().replace("%", "\\%"));
+		}
+
+		IPage page = new Page(pageNo, pageSize);
+		IPage pageList = paramsReportExportHistoryEOService.queryPage(page, paramsReportExportHistoryEO, cut);
+		return Result.OK(pageList);
+	}
+
+
+
 
 
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportExportHistoryEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportExportHistoryEO.java
new file mode 100644
index 000000000..67a91a94f
--- /dev/null
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportExportHistoryEO.java
@@ -0,0 +1,98 @@
+package com.jero.modules.cert.report.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: 上报库导出历史
+ * @Author: jero-boot
+ * @Date:   2022-07-04
+ * @Version: V1.0
+ */
+@Data
+@TableName("params_report_export_history")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="params_report_export_history对象", description="上报库导出历史")
+public class ParamsReportExportHistoryEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+	/**上报库id*/
+	@Excel(name = "上报库id", width = 15)
+    @ApiModelProperty(value = "上报库id")
+    private String paramsManifestId;
+
+	/**导出类型*/
+	@Excel(name = "导出类型", width = 15)
+    @ApiModelProperty(value = "导出类型")
+    private String exportType;
+
+	/**导出时间*/
+	@Excel(name = "导出时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "导出时间")
+    private java.util.Date exportTime;
+
+	/**导出文件id*/
+	@Excel(name = "导出文件id", width = 15)
+    @ApiModelProperty(value = "导出文件id")
+    private String exportFileId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "导出文件名称")
+    private String exportFileName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "项目名称")
+    private String projectName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "清单标题")
+    private String title;
+}
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java
new file mode 100644
index 000000000..6a4782be3
--- /dev/null
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java
@@ -0,0 +1,59 @@
+package com.jero.modules.cert.report.enums;
+
+import com.jero.common.constant.enums.CutEnum;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum ExportTypeEnum {
+    NORMAL("常规导出","1","Normal export"),
+    CUSTOM("自定义导出","2","Custom export");
+
+    String name;
+    String value;
+    String enName;
+
+    ExportTypeEnum(String name, String value, String enName) {
+        this.name = name;
+        this.value = value;
+        this.enName = enName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+    public static Map<String,String> toMap(String cut){
+        Map<String,String> map = new HashMap<>();
+        if (CutEnum.CN.getValue().equals(cut)) {
+            for (ExportTypeEnum exportTypeEnum : ExportTypeEnum.values()) {
+                map.put(exportTypeEnum.getValue(), exportTypeEnum.getName());
+            }
+        } else if (CutEnum.EN.getValue().equals(cut)) {
+            for (ExportTypeEnum exportTypeEnum : ExportTypeEnum.values()) {
+                map.put(exportTypeEnum.getValue(), exportTypeEnum.getEnName());
+            }
+        }
+        return map;
+    }
+}
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java
new file mode 100644
index 000000000..0cf024066
--- /dev/null
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java
@@ -0,0 +1,19 @@
+package com.jero.modules.cert.report.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 上报库导出历史
+ * @Author: jero-boot
+ * @Date:   2022-07-04
+ * @Version: V1.0
+ */
+public interface ParamsReportExportHistoryEOMapper extends BaseMapper<ParamsReportExportHistoryEO> {
+
+    IPage pageInfo(@Param("page") IPage page, ParamsReportExportHistoryEO paramsReportExportHistoryEO);
+}
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml
new file mode 100644
index 000000000..8451ceabe
--- /dev/null
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.cert.report.mapper.ParamsReportExportHistoryEOMapper">
+    <resultMap id="ParamsReportExportHistoryEOResultMap" type="com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="params_manifest_id" property="paramsManifestId" />
+        <result column="export_type" property="exportType" />
+        <result column="export_time" property="exportTime" />
+        <result column="export_file_id" property="exportFileId" />
+    </resultMap>
+
+    <sql id="BaseColumnList">
+        preh.id as id,
+        preh.export_type as export_type,
+        preh.export_time as export_time,
+        preh.export_file_id as export_file_id,
+        preh.params_manifest_id as params_manifest_id,
+        pr.create_by as create_by,
+        pr.create_time as create_time,
+        pr.update_by as update_by,
+        pr.update_time as update_time,
+        pm.title as title,
+        concat(pni.project_name,'-',pyni.year_name) as project_name
+    </sql>
+
+    <sql id="BaseQuerySql">
+        <where>
+            <if test="paramsReportExportHistoryEO != null">
+                <if test="paramsReportExportHistoryEO.projectName !=null and paramsReportExportHistoryEO.projectName !=''">
+                    AND project_name LIKE CONCAT(CONCAT('%',#{paramsReportExportHistoryEO.projectName}),'%')
+                </if>
+                <if test="paramsReportExportHistoryEO.title !=null and paramsReportExportHistoryEO.title !=''">
+                    AND title LIKE CONCAT(CONCAT('%',#{paramsReportExportHistoryEO.title}),'%')
+                </if>
+                <if test="paramsReportExportHistoryEO.paramsManifestId !=null and paramsReportExportHistoryEO.paramsManifestId !=''">
+                    AND params_manifest_id = #{paramsReportExportHistoryEO.paramsManifestId}
+                </if>
+            </if>
+        </where>
+    </sql>
+
+    <select id="pageInfo" resultMap="ParamsReportExportHistoryEOResultMap">
+        select tmp_tb.* from(
+        select <include refid="BaseColumnList"/>
+        from params_report_export_history preh
+        left join params_report as pr on pr.id = preh.params_manifest_id
+        left join params_manifest as pm on pm.id = pr.old_params_manifest_id
+        left join project_library_base as plb on plb.id = pm.project_id
+        left join project_name_info as pni on plb.project_name_id = pni.id
+        left join project_year_name_info as pyni on plb.year_name_id = pyni.id
+        ) tmp_tb
+        <include refid="BaseQuerySql"/>
+        order by export_time desc
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java
new file mode 100644
index 000000000..c69874c9c
--- /dev/null
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java
@@ -0,0 +1,64 @@
+package com.jero.modules.cert.report.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 上报库导出历史
+ * @Author: jero-boot
+ * @Date:   2022-07-04
+ * @Version: V1.0
+ */
+public interface IParamsReportExportHistoryEOService extends IService<ParamsReportExportHistoryEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param paramsReportExportHistoryEO
+	 * @return
+	 */
+    void add(ParamsReportExportHistoryEO paramsReportExportHistoryEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param paramsReportExportHistoryEO
+	 * @return
+	 */
+    void editById(ParamsReportExportHistoryEO paramsReportExportHistoryEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ParamsReportExportHistoryEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ParamsReportExportHistoryEO> queryList();
+
+	IPage queryPage(IPage page, ParamsReportExportHistoryEO paramsReportExportHistoryEO, String cut);
+}
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 7a88644e6..1f890ed77 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
@@ -21,10 +21,13 @@ 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.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.vo.ParamsReportDetailVO;
 import com.jero.modules.cert.template.enums.ControlTypeEnum;
 import com.jero.modules.document.enums.FieldTypeEnum;
@@ -43,6 +46,7 @@ import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.service.ISysDictItemService;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.entity.ContentType;
 import org.apache.poi.common.usermodel.HyperlinkType;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.hssf.util.HSSFColor;
@@ -54,7 +58,9 @@ import org.apache.poi.xssf.usermodel.*;
 import org.aspectj.util.FileUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -93,6 +99,9 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 	@Autowired
 	private IOSSFileService ossFileService;
 
+	@Autowired
+	private IParamsReportExportHistoryEOService paramsReportExportHistoryEOService;
+
 	@Value(value = "${jero.path.upload}")
 	private String uploadpath;
 
@@ -486,7 +495,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 		OutputStream excelOS = null;
 		XSSFWorkbook workbook = new XSSFWorkbook();
 		String fileOriName = "上报库参数项常规导出信息";
-		if (org.apache.commons.lang.StringUtils.isNotEmpty(paramsReportDetailVO.getExportName())) {
+		if (StringUtils.isNotEmpty(paramsReportDetailVO.getExportName())) {
 			fileOriName = paramsReportDetailVO.getExportName();
 		}
 		//创建临时文件夹
@@ -584,6 +593,18 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 			while ((len = fis.read()) != -1) {
 				os.write(len);
 			}
+
+			// 添加导出历史
+			String uploadFileName = fileOriName + ".zip";
+			MultipartFile mFile = new MockMultipartFile(uploadFileName, uploadFileName, ContentType.APPLICATION_OCTET_STREAM.toString(), fis); // 用于上传
+			OSSFile ossFile = ossFileService.uploadLocalOfCos(mFile, "/report", "", CutEnum.CN.getValue()); // 上传导出的压缩包
+			ParamsReportExportHistoryEO paramsReportExportHistoryEO = new ParamsReportExportHistoryEO();
+			paramsReportExportHistoryEO.setExportType(ExportTypeEnum.NORMAL.getValue());
+			paramsReportExportHistoryEO.setExportFileId(ossFile.getId());
+			paramsReportExportHistoryEO.setParamsManifestId(paramsReportDetailVO.getParamsManifestId());
+			paramsReportExportHistoryEO.setExportTime(new Date());
+			paramsReportExportHistoryEOService.add(paramsReportExportHistoryEO);
+
 			os.flush();
 			os.close(); // 后开先关
 			fis.close(); // 先开后关
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportExportHistoryEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportExportHistoryEOServiceImpl.java
new file mode 100644
index 000000000..f4444d91a
--- /dev/null
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportExportHistoryEOServiceImpl.java
@@ -0,0 +1,122 @@
+package com.jero.modules.cert.report.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO;
+import com.jero.modules.cert.report.enums.ExportTypeEnum;
+import com.jero.modules.cert.report.mapper.ParamsReportExportHistoryEOMapper;
+import com.jero.modules.cert.report.service.IParamsReportExportHistoryEOService;
+import com.jero.modules.oss.entity.OSSFile;
+import com.jero.modules.oss.service.IOSSFileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Date;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 上报库导出历史
+ * @Author: jero-boot
+ * @Date:   2022-07-04
+ * @Version: V1.0
+ */
+@Service
+public class ParamsReportExportHistoryEOServiceImpl extends ServiceImpl<ParamsReportExportHistoryEOMapper, ParamsReportExportHistoryEO> implements IParamsReportExportHistoryEOService {
+
+	@Autowired
+	private ParamsReportExportHistoryEOMapper paramsReportExportHistoryEOMapper;
+
+	@Autowired
+	private IOSSFileService ossFileService;
+	/**
+	 * 保存
+	 *
+	 * @param paramsReportExportHistoryEO
+	 * @return
+	 */
+	@Override
+    public void add(ParamsReportExportHistoryEO paramsReportExportHistoryEO) {
+        Date now = new Date();
+        paramsReportExportHistoryEO.setCreateTime(now);
+        paramsReportExportHistoryEO.setUpdateTime(now);
+        save(paramsReportExportHistoryEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param paramsReportExportHistoryEO
+	 * @return
+	 */
+	@Override
+    public void editById(ParamsReportExportHistoryEO paramsReportExportHistoryEO) {
+    	Date now = new Date();
+        paramsReportExportHistoryEO.setUpdateTime(now);
+    	saveOrUpdate(paramsReportExportHistoryEO);
+    }
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public void deleteById(String id) {
+        removeById(id);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public void deleteByIds(List<String> ids) {
+        removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public ParamsReportExportHistoryEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<ParamsReportExportHistoryEO> queryList() {
+        return list();
+    }
+
+	@Override
+	public IPage queryPage(IPage page, ParamsReportExportHistoryEO paramsReportExportHistoryEO, String cut) {
+		IPage pageInfo = paramsReportExportHistoryEOMapper.pageInfo(page, paramsReportExportHistoryEO);
+		List<ParamsReportExportHistoryEO> list = pageInfo.getRecords();
+
+		Map<String, String> exportTypeMap = ExportTypeEnum.toMap(cut);
+		list.forEach(exportHistoryEO -> {
+			// 处理文件名
+			OSSFile ossFile = ossFileService.getById(exportHistoryEO.getExportFileId());
+			if (ObjectUtil.isNotEmpty(ossFile)) {
+				exportHistoryEO.setExportFileName(ossFile.getFileName());
+			}
+
+			// 处理导出类型
+			exportHistoryEO.setExportType(exportTypeMap.get(exportHistoryEO.getExportType()));
+		});
+
+		return pageInfo;
+	}
+}
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java
index 6786e76ff..df73c3ae6 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java
@@ -203,6 +203,9 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> impl
 
         OSSFile oSSFile = new OSSFile();
         String ctxPath = uploadCospath;
+        if (org.apache.commons.lang.StringUtils.isNotBlank(bizPath)) {
+            ctxPath += bizPath;
+        }
         String fileName = null;
         String fileType = null;
 
@@ -227,7 +230,17 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> impl
                     throw new JeroBootException("Only upload pdf,word,excel type of file Please select the file again！");
                 }
             }
-        } else {
+        } else if ("2".equals(state)) {
+            String fileTypeStrTwo = ".doc,.DOC,.docx,.DOCX,.xls, .XLS,.xlsx,.XLSX";
+            //固定文件
+            if (!fileTypeStrTwo.contains(fileType)) {
+                if (cut.equals(CutEnum.CN.getValue())) {
+                    throw new JeroBootException("只能够上传word,excel类型的文件。请重新选择文件！");
+                } else {
+                    throw new JeroBootException("Only upload word,excel type of file Please select the file again！");
+                }
+            }
+        }  else {
             if (CommonUtils.limitFileSuffix(orgName, fileSuffixLimits)) {
                 if (cut.equals(CutEnum.CN.getValue())) {
                     throw new JeroBootException("不能上传" + StringUtils.join(fileSuffixLimits, ",") + "类型的文件。请重新选择文件！");

From e283a17dd121696fab2bf61797ad89547a790612 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 4 Jul 2022 15:45:28 +0800
Subject: [PATCH 17/31] =?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

---
 jero-web/src/components/AssignedBy/index.vue                     | 1 +
 jero-web/src/components/OcrTable/DocTable.vue                    | 1 +
 jero-web/src/components/OcrTable/index.vue                       | 1 +
 jero-web/src/components/SplitDetailTable/index.vue               | 1 +
 jero-web/src/components/SplitTable/DocTable.vue                  | 1 +
 jero-web/src/components/SplitTable/index.vue                     | 1 +
 jero-web/src/components/Standardselection/index.vue              | 1 +
 jero-web/src/components/UpdateLog/index.vue                      | 1 +
 jero-web/src/components/exporthistory/index.vue                  | 1 +
 jero-web/src/components/frameAssembly/index.vue                  | 1 +
 jero-web/src/components/tableCollection/index.vue                | 1 +
 jero-web/src/components/tableDate/index.vue                      | 1 +
 .../components/initiatingProcess.vue                             | 1 +
 .../businessSupport/collectionOfRegulatoryOpinions/index.vue     | 1 +
 .../regulationReport/components/RegulationMonthlyFill.vue        | 1 +
 .../regulationReport/components/RegulationMonthlyManagement.vue  | 1 +
 .../regulationReport/components/modules/fillTable.vue            | 1 +
 jero-web/src/views/documentManage/library/docDetail/index.vue    | 1 +
 jero-web/src/views/documentManage/tags/tabs/TagContent.vue       | 1 +
 .../documentTools/searchCenter/components/DocumentLibrary.vue    | 1 +
 .../src/views/documentTools/searchCenter/components/whole.vue    | 1 +
 .../src/views/documentTools/virtualList/components/addModel.vue  | 1 +
 jero-web/src/views/documentTools/virtualList/index.vue           | 1 +
 jero-web/src/views/parameter/ParameterTemplate/index.vue         | 1 +
 jero-web/src/views/parameter/escalationlibrary/index.vue         | 1 +
 jero-web/src/views/parameter/managementdetails/index.vue         | 1 +
 jero-web/src/views/parameter/parameterexport/index.vue           | 1 +
 jero-web/src/views/parameter/parameterlist/index.vue             | 1 +
 .../views/processCenter/components/engineeringConfirmation.vue   | 1 +
 jero-web/src/views/processCenter/procedure/index.vue             | 1 +
 .../processList/tabComponents/alreadyProcess/index.vue           | 1 +
 .../processList/tabComponents/alreadySend/index.vue              | 1 +
 .../processList/tabComponents/monitorProcess/index.vue           | 1 +
 .../processList/tabComponents/processCenter/index.vue            | 1 +
 .../processCenter/processList/tabComponents/taskDraft/index.vue  | 1 +
 .../projectManagement/components/TaskParameterCollection.vue     | 1 +
 .../projectManagement/components/certificationDirectory.vue      | 1 +
 jero-web/src/views/projectManagement/components/listAddModel.vue | 1 +
 .../src/views/projectManagement/components/nonConformance.vue    | 1 +
 jero-web/src/views/projectManagement/components/transferList.vue | 1 +
 .../src/views/projectManagement/dialog/ParameterTemplate.vue     | 1 +
 .../src/views/projectManagement/dialog/ParameterTemplateAdd.vue  | 1 +
 .../projectManagement/dialog/ProjectCollectionParameters.vue     | 1 +
 jero-web/src/views/projectManagement/projectLibrary/index.vue    | 1 +
 .../src/views/projectManagement/projectNonConformance/index.vue  | 1 +
 jero-web/src/views/regulatoryEarlyWarning/index.vue              | 1 +
 jero-web/src/views/system/modules/DeptUserInfo.vue               | 1 +
 47 files changed, 47 insertions(+)

diff --git a/jero-web/src/components/AssignedBy/index.vue b/jero-web/src/components/AssignedBy/index.vue
index 7d6973111..8a81c237e 100644
--- a/jero-web/src/components/AssignedBy/index.vue
+++ b/jero-web/src/components/AssignedBy/index.vue
@@ -49,6 +49,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="pageOnChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/components/OcrTable/DocTable.vue b/jero-web/src/components/OcrTable/DocTable.vue
index 0e7685e2a..f58b83b24 100644
--- a/jero-web/src/components/OcrTable/DocTable.vue
+++ b/jero-web/src/components/OcrTable/DocTable.vue
@@ -52,6 +52,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="onChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/components/OcrTable/index.vue b/jero-web/src/components/OcrTable/index.vue
index b9dac4c21..eca906c74 100644
--- a/jero-web/src/components/OcrTable/index.vue
+++ b/jero-web/src/components/OcrTable/index.vue
@@ -53,6 +53,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="onChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/components/SplitDetailTable/index.vue b/jero-web/src/components/SplitDetailTable/index.vue
index 8fb036ea0..930453350 100644
--- a/jero-web/src/components/SplitDetailTable/index.vue
+++ b/jero-web/src/components/SplitDetailTable/index.vue
@@ -51,6 +51,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="onChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/components/SplitTable/DocTable.vue b/jero-web/src/components/SplitTable/DocTable.vue
index 2ca67b39a..dc12b047b 100644
--- a/jero-web/src/components/SplitTable/DocTable.vue
+++ b/jero-web/src/components/SplitTable/DocTable.vue
@@ -48,6 +48,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="onChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/components/SplitTable/index.vue b/jero-web/src/components/SplitTable/index.vue
index d017dad75..10b6a4a38 100644
--- a/jero-web/src/components/SplitTable/index.vue
+++ b/jero-web/src/components/SplitTable/index.vue
@@ -53,6 +53,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="onChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/components/Standardselection/index.vue b/jero-web/src/components/Standardselection/index.vue
index a6c0273bf..2c5c7b703 100644
--- a/jero-web/src/components/Standardselection/index.vue
+++ b/jero-web/src/components/Standardselection/index.vue
@@ -42,6 +42,7 @@
             show-size-changer
             :page-size.sync="pageSize"
             :total="total"
+            :current="pageNo"
             @change="onChange"
             @showSizeChange="SizeChange"
           />
diff --git a/jero-web/src/components/UpdateLog/index.vue b/jero-web/src/components/UpdateLog/index.vue
index 2035ca5a8..70f8b1380 100644
--- a/jero-web/src/components/UpdateLog/index.vue
+++ b/jero-web/src/components/UpdateLog/index.vue
@@ -36,6 +36,7 @@
         show-size-changer
         :page-size.sync="pageSize "
         :total="total"
+        :current="pageNo"
         @change="onChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/components/exporthistory/index.vue b/jero-web/src/components/exporthistory/index.vue
index 2b0eb4638..0df71407e 100644
--- a/jero-web/src/components/exporthistory/index.vue
+++ b/jero-web/src/components/exporthistory/index.vue
@@ -54,6 +54,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="pageOnChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/components/frameAssembly/index.vue b/jero-web/src/components/frameAssembly/index.vue
index b98fb558f..5f1ba686d 100644
--- a/jero-web/src/components/frameAssembly/index.vue
+++ b/jero-web/src/components/frameAssembly/index.vue
@@ -65,6 +65,7 @@
           show-size-changer
           :page-size.sync="pageSize"
           :total="total"
+          :current="pageNo"
           @change="onChange"
           @showSizeChange="SizeChange"
         />
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index c655dfdc0..d4e712fbe 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -53,6 +53,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         :pageSizeOptions='pageSizeOptions'
         @change="pageOnChange"
         @showSizeChange="SizeChange"
diff --git a/jero-web/src/components/tableDate/index.vue b/jero-web/src/components/tableDate/index.vue
index 7069ad28c..8234abf2b 100644
--- a/jero-web/src/components/tableDate/index.vue
+++ b/jero-web/src/components/tableDate/index.vue
@@ -51,6 +51,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="onChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
index dba067edc..2634e0991 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
@@ -29,6 +29,7 @@
             show-size-changer
             :page-size.sync="pageSize"
             :total="total"
+            :current="pageNo"
             @change="pageOnChange"
             @showSizeChange="SizeChange"
           />
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
index 45a26c812..9d54df13b 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
@@ -84,6 +84,7 @@
           show-size-changer
           :page-size.sync="pageSize"
           :total="total"
+          :current="pageNo"
           @change="pageOnChange"
           @showSizeChange="SizeChange"
         />
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue
index 466f3f69a..d4942d910 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue
@@ -65,6 +65,7 @@
           show-size-changer
           :page-size.sync="pageSize"
           :total="total"
+          :current="pageNo"
           @change="pageOnChange"
           @showSizeChange="SizeChange"
         />
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
index 8ffbdf0be..e92a7a565 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
@@ -62,6 +62,7 @@
           show-size-changer
           :page-size.sync="pageSize"
           :total="total"
+          :current="pageNo"
           @change="pageOnChange"
           @showSizeChange="SizeChange"
         />
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
index e6dddfc5f..f738e0f96 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
@@ -42,6 +42,7 @@
           show-size-changer
           :page-size.sync="pageSize "
           :total="total"
+          :current="pageNo"
           @change="onChange"
           @showSizeChange="SizeChange"
         />
diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue
index fbd8424c5..750f5e900 100644
--- a/jero-web/src/views/documentManage/library/docDetail/index.vue
+++ b/jero-web/src/views/documentManage/library/docDetail/index.vue
@@ -193,6 +193,7 @@
           show-size-changer
           :page-size.sync="pageSize "
           :total="total"
+          :current="pageNo"
           @change="onChange"
           @showSizeChange="SizeChange"
         />
diff --git a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue
index bf0488485..62ef32172 100644
--- a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue
@@ -88,6 +88,7 @@
         show-size-changer
         :page-size.sync="queryParams.pageSize"
         :total="total"
+        :current="pageNo"
         @change="onChangePage"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
index 81bd4cca4..82463a0bb 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
@@ -200,6 +200,7 @@
               show-size-changer
               :page-size.sync="pageSize"
               :total="total"
+              :current="pageNo"
               @change="pageOnChange"
               @showSizeChange="SizeChange"
             />
diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
index 7c7b1e57b..899af7f78 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
@@ -80,6 +80,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="pageOnChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/views/documentTools/virtualList/components/addModel.vue b/jero-web/src/views/documentTools/virtualList/components/addModel.vue
index 97be5e2e4..6f9d8d207 100644
--- a/jero-web/src/views/documentTools/virtualList/components/addModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/addModel.vue
@@ -73,6 +73,7 @@
           show-size-changer
           :page-size.sync="pageSize"
           :total="total"
+          :current="pageNo"
           @change="onChange"
           @showSizeChange="SizeChange"
         />
diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue
index d7e5da20a..9df85be2d 100644
--- a/jero-web/src/views/documentTools/virtualList/index.vue
+++ b/jero-web/src/views/documentTools/virtualList/index.vue
@@ -96,6 +96,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="pageOnChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue
index d4bd0efed..fb8d13d60 100644
--- a/jero-web/src/views/parameter/ParameterTemplate/index.vue
+++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue
@@ -79,6 +79,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="pageOnChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue
index 1759cc496..868b0852e 100644
--- a/jero-web/src/views/parameter/escalationlibrary/index.vue
+++ b/jero-web/src/views/parameter/escalationlibrary/index.vue
@@ -60,6 +60,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="pageOnChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue
index 6b6852905..3c29f30ad 100644
--- a/jero-web/src/views/parameter/managementdetails/index.vue
+++ b/jero-web/src/views/parameter/managementdetails/index.vue
@@ -99,6 +99,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="pageOnChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue
index bad629984..b0a816217 100644
--- a/jero-web/src/views/parameter/parameterexport/index.vue
+++ b/jero-web/src/views/parameter/parameterexport/index.vue
@@ -59,6 +59,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="pageOnChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue
index 63cba6e64..0237cdaeb 100644
--- a/jero-web/src/views/parameter/parameterlist/index.vue
+++ b/jero-web/src/views/parameter/parameterlist/index.vue
@@ -96,6 +96,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="pageOnChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
index 5082b874a..cf0e8832f 100644
--- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
@@ -271,6 +271,7 @@
           show-quick-jumper
           :page-size.sync="pageSize"
           :total="total"
+          :current="pageNo"
           @change="pageOnChange"
         />
       </div>
diff --git a/jero-web/src/views/processCenter/procedure/index.vue b/jero-web/src/views/processCenter/procedure/index.vue
index 75491be1d..0cbd6b696 100644
--- a/jero-web/src/views/processCenter/procedure/index.vue
+++ b/jero-web/src/views/processCenter/procedure/index.vue
@@ -33,6 +33,7 @@
           show-size-changer
           :page-size.sync="pageSize"
           :total="total"
+          :current="pageNo"
           @change="onChange"
           @showSizeChange="SizeChange"
         />
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 ff502856a..1cbc5affe 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue
@@ -28,6 +28,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="onChange"
         @showSizeChange="SizeChange"
       />
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 e3bfe6b62..b3904cdd1 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue
@@ -28,6 +28,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="onChange"
         @showSizeChange="SizeChange"
       />
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 951a70c96..9834b57db 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue
@@ -28,6 +28,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="onChange"
         @showSizeChange="SizeChange"
       />
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 0caf01bd9..e2fc23025 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
@@ -25,6 +25,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="onChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/views/processCenter/processList/tabComponents/taskDraft/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/taskDraft/index.vue
index ecbd4152c..393a160ab 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/taskDraft/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/taskDraft/index.vue
@@ -23,6 +23,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="onChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
index 6a68b8aad..e9bd13cd4 100644
--- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
@@ -78,6 +78,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="pageOnChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/views/projectManagement/components/certificationDirectory.vue b/jero-web/src/views/projectManagement/components/certificationDirectory.vue
index ec6e90de3..763382626 100644
--- a/jero-web/src/views/projectManagement/components/certificationDirectory.vue
+++ b/jero-web/src/views/projectManagement/components/certificationDirectory.vue
@@ -44,6 +44,7 @@
             show-size-changer
             :page-size.sync="pageSize"
             :total="total"
+            :current="pageNo"
             @change="onChange"
             @showSizeChange="SizeChange"
           />
diff --git a/jero-web/src/views/projectManagement/components/listAddModel.vue b/jero-web/src/views/projectManagement/components/listAddModel.vue
index be9fb7648..4d2ba5912 100644
--- a/jero-web/src/views/projectManagement/components/listAddModel.vue
+++ b/jero-web/src/views/projectManagement/components/listAddModel.vue
@@ -70,6 +70,7 @@
           show-size-changer
           :page-size.sync="pageSize"
           :total="total"
+          :current="pageNo"
           @change="onChange"
           @showSizeChange="SizeChange"
         />
diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue
index acf465ea0..3a2c95ba4 100644
--- a/jero-web/src/views/projectManagement/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/components/nonConformance.vue
@@ -73,6 +73,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="pageOnChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/views/projectManagement/components/transferList.vue b/jero-web/src/views/projectManagement/components/transferList.vue
index 22a8d653a..00ff61adc 100644
--- a/jero-web/src/views/projectManagement/components/transferList.vue
+++ b/jero-web/src/views/projectManagement/components/transferList.vue
@@ -47,6 +47,7 @@
           show-size-changer
           :page-size.sync="pageSize"
           :total="total"
+          :current="pageNo"
           @change="onChange"
           @showSizeChange="SizeChange"
         />
diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue
index 2d477c1bd..cb2d49353 100644
--- a/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue
+++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue
@@ -54,6 +54,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="pageOnChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
index bf8781520..a4151bd78 100644
--- a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
+++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
@@ -103,6 +103,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="pageOnChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
index 3abd7c09a..513a951b2 100644
--- a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
+++ b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
@@ -67,6 +67,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="pageOnChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue
index ae2a68b99..b314f466d 100644
--- a/jero-web/src/views/projectManagement/projectLibrary/index.vue
+++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue
@@ -144,6 +144,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="pageOnChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
index b09a05a2a..3b7565f88 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
@@ -173,6 +173,7 @@
         show-size-changer
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="pageOnChange"
         @showSizeChange="SizeChange"
       />
diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue
index edc00ac52..81e4ef587 100644
--- a/jero-web/src/views/regulatoryEarlyWarning/index.vue
+++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue
@@ -43,6 +43,7 @@
           show-size-changer
           :page-size.sync="pageSize"
           :total="total"
+          :current="pageNo"
           @change="pageOnChange"
           @showSizeChange="SizeChange"
         />
diff --git a/jero-web/src/views/system/modules/DeptUserInfo.vue b/jero-web/src/views/system/modules/DeptUserInfo.vue
index b1521d8fb..ce146c480 100644
--- a/jero-web/src/views/system/modules/DeptUserInfo.vue
+++ b/jero-web/src/views/system/modules/DeptUserInfo.vue
@@ -91,6 +91,7 @@
         :show-total="total => $t('total')+` ${total} `+$t('strip')"
         :page-size.sync="pageSize"
         :total="total"
+        :current="pageNo"
         @change="pageOnChange"
         @showSizeChange="SizeChange"
       />

From 64fc7d95d88cbb59dcf3781a1a9c0bd60432d271 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Mon, 4 Jul 2022 15:50:29 +0800
Subject: [PATCH 18/31] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=93-=E5=AF=BC=E5=87=BA=E5=8E=86=E5=8F=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
index 1f890ed77..d610dc012 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
@@ -495,6 +495,9 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 		OutputStream excelOS = null;
 		XSSFWorkbook workbook = new XSSFWorkbook();
 		String fileOriName = "上报库参数项常规导出信息";
+		if (CutEnum.EN.getValue().equals(paramsReportDetailVO.getCut())) {
+			fileOriName = "Params report normal data";
+		}
 		if (StringUtils.isNotEmpty(paramsReportDetailVO.getExportName())) {
 			fileOriName = paramsReportDetailVO.getExportName();
 		}

From e8b98d0d900bb65441e4bc076965501bad630fc3 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 4 Jul 2022 16:27:58 +0800
Subject: [PATCH 19/31] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E5=8F=82=E6=95=B0=E9=A1=B9=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E9=A1=B5=E4=B8=8E=E5=90=8E=E7=AB=AF=E8=81=94=E8=B0=83=20?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E7=AE=A1=E7=90=86-=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E9=A1=B9=E6=9F=A5=E7=9C=8B=E9=A1=B5-=E5=B8=B8?=
 =?UTF-8?q?=E8=A7=84=E5=AF=BC=E5=87=BA=E4=B8=8E=E5=90=8E=E7=AB=AF=E8=81=94?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   8 +
 jero-web/src/common/lang/zh-cn.js             |   8 +
 .../src/components/exporthistory/index.vue    |   7 +-
 .../src/components/uploadFileChange/file.vue  |   4 +-
 .../parameter/escalationlibrary/index.vue     |   2 +-
 .../commponts/conventionalmodle.vue           | 388 ++++++++++++++++++
 .../commponts/customexportmodle.vue           | 358 ++++++++++++++++
 .../parameter/managementdetails/index.vue     |  91 ++--
 .../parameterexport/components/addModel.vue   |  14 +-
 9 files changed, 837 insertions(+), 43 deletions(-)
 create mode 100644 jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
 create mode 100644 jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 973899589..a08bfb0fa 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -176,6 +176,8 @@ module.exports = {
   MenuType: 'Menu type',
   menu: 'Menu',
   ButtonsPermissions: 'Buttons / permissions',
+  ConventionalExport:'Conventional export',
+  CustomExport:'Custom export',
   assembly: 'Assembly',
   route: 'Route',
   AddSubmenu: 'Add submenu',
@@ -385,6 +387,7 @@ module.exports = {
   StandardDetails: 'Standard Details',
   whole: 'Whole',
   DocumentLibrary: 'Document Library',
+  GeneralExportInformation:'General export information',
   DocumentComparisonLibrary: 'Document comparison Library',
   weekly: 'Weekly',
   SyncLibrary: 'Sync to doc. library',
@@ -727,6 +730,7 @@ module.exports = {
   // 参数收集开始
   MaintainConfigureInfo: 'Maintain configuration information',
   ParameteItemCollectionList: 'Parameter item collection list',
+  ParameterViewPage:'Parameter View page',
   Areyousureparameteritems: 'Are you sure to submit the selected parameter items?',
   Theselectedconfiguration: 'The configuration can only be added when the parameter items in the parameter list are to be collected or changed',
   NoConfigurationNotStart: 'No configuration added, unable to start collection, please check',
@@ -792,6 +796,10 @@ module.exports = {
   releaseVersion: 'Release Version',
   parameterTemplate: 'Parameter Template',
   contentDescription: 'Content Description',
+  WhetherMergeParameters:'Whether to merge parameters',
+  merge:'merge',
+  nonjoinder:'nonjoinder',
+  MergeSeparator:'Merge separator',
   parameterTemplateExportName: 'Parameter List',
   parameterDataExport: 'Parameter Export Data',
   // 参数收集结束
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 2aba9452a..eb2ba61c9 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -178,6 +178,8 @@ module.exports = {
   MenuType: '菜单类型',
   menu: '菜单',
   ButtonsPermissions: '按钮/权限',
+  ConventionalExport:'常规导出',
+  CustomExport:'自定义导出',
   assembly: '组件',
   route: '路径',
   AddSubmenu: '添加子菜单',
@@ -390,6 +392,7 @@ module.exports = {
   StandardDetails: '标准详情',
   whole: '全部',
   DocumentLibrary: '文档库',
+  GeneralExportInformation:'常规导出信息',
   DocumentComparisonLibrary: '文档对比库',
   weekly: '周报',
   SyncLibrary: '同步至文档库',
@@ -742,6 +745,7 @@ module.exports = {
   // 参数收集
   MaintainConfigureInfo: '维护配置信息',
   ParameteItemCollectionList: '参数项收集清单',
+  ParameterViewPage:'参数项查看页',
   Areyousureparameteritems: '确认提交所选参数项嘛?',
   Theselectedconfiguration: '参数清单中参数项均为待发起收集或变更时，才能添加配置',
   NoConfigurationNotStart: '未添加任何配置，无法开始收集，请检查',
@@ -807,6 +811,10 @@ module.exports = {
   releaseVersion: '发布版本',
   parameterTemplate: '参数模板',
   contentDescription: '内容说明',
+  WhetherMergeParameters:'是否合并参数',
+  merge:'合并',
+  nonjoinder:'不合并',
+  MergeSeparator:'合并分隔符',
   parameterTemplateExportName: '参数项列表',
   parameterDataExport: '参数项导出数据',
   // 参数收集结束
diff --git a/jero-web/src/components/exporthistory/index.vue b/jero-web/src/components/exporthistory/index.vue
index 2b0eb4638..418714052 100644
--- a/jero-web/src/components/exporthistory/index.vue
+++ b/jero-web/src/components/exporthistory/index.vue
@@ -21,7 +21,7 @@
             <a-form-model-item :label="$t('ListTitle')" prop='ListTitle'>
               <a-input
                        :placeholder="$t('PleaseEnter')+$t('ListTitle')"
-                       v-model='formData.projectName' />
+                       v-model='formData.title' />
             </a-form-model-item>
           </a-col>
           <a-col :span='6' style='margin-top: 4px;'>
@@ -178,10 +178,11 @@ export default {
       console.log(this.areaTable,'this.areaTable')
       this.listVisible = false
     },
+    // 下载文件
     editArea(val) {
-      this.listVisibleRowDate = val
+      // this.listVisibleRowDate = val
       console.log(val)
-      this.listVisible = true
+      // this.listVisible = true
     },
     pageOnChange(page, pageSize) {
       this.pageNo = page
diff --git a/jero-web/src/components/uploadFileChange/file.vue b/jero-web/src/components/uploadFileChange/file.vue
index f07c8a165..5b7c3c846 100644
--- a/jero-web/src/components/uploadFileChange/file.vue
+++ b/jero-web/src/components/uploadFileChange/file.vue
@@ -2,7 +2,7 @@
   <div>
     <a-modal v-model="visible" :maskClosable="false" :footer="[]" :title="title">
       <a-upload-dragger
-        accept='*.*'
+        :accept="accept"
         :disabled="disabled"
         class="ant-upload-list"
         :class="{'uploadFile':isUploadFile}"
@@ -34,7 +34,7 @@ import { mapGetters } from 'vuex'
 
 export default {
   name: 'file',
-  props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile','detailDate'],
+  props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile','detailDate','accept'],
   data() {
     return {
       visible: false,
diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue
index 1759cc496..2a69b070c 100644
--- a/jero-web/src/views/parameter/escalationlibrary/index.vue
+++ b/jero-web/src/views/parameter/escalationlibrary/index.vue
@@ -64,7 +64,7 @@
         @showSizeChange="SizeChange"
       />
     </div>
-    <!--     复制参数模板-->
+    <!--     导出历史模板-->
     <a-modal class="show-drawer" :title="titleTag" width="900px" v-model="drawerVisible" :footer="null">
       <export-history v-if='drawerVisible' @areaVisible='drawerVisible = false'></export-history>
     </a-modal>
diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
new file mode 100644
index 000000000..53cd8c84b
--- /dev/null
+++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
@@ -0,0 +1,388 @@
+<!--常规导出-->
+<template>
+  <div>
+    <a-modal
+      :title="title"
+      :maskClosable="false"
+      :width="750"
+      placement="right"
+      :closable="true"
+      @cancel="handleCancel"
+      :visible="visible"
+      style="height: 100%;overflow: auto;padding-bottom: 53px;">
+      <a-spin :spinning="confirmLoading">
+        <a-form>
+          <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+            <a-row :gutter="24">
+              <a-col :span="24">
+                <div class="box-title-text">
+                  <div class="title-text" :title="$t('certificationCategory')">
+                    <span>{{$t('certificationCategory')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" prop="certificationCategory">
+                    <j-dict-select-tag class="box-input" v-model="formInline.certCategory"
+                                       :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
+                                       :type="'select'"
+                                       @input="certCategoryName"
+                                       :triggerChange="false" :dictCode="'cert_category'"/>
+                  </a-form-model-item>
+
+                </div>
+              </a-col>
+
+            </a-row>
+            <a-row :gutter="24">
+              <a-col :span="24">
+                <div class="box-title-text">
+                  <div class="title-text" :title="$t('configure')">
+                    <span>{{$t('configure')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" prop="configure">
+                    <j-multi-select-tag class="box-input" v-model="formInline.configIds"
+                                        :options="dictOptions"
+                                        :placeholder="$t('PleaseSelect')+$t('configure')"
+                                        :type="'select'"
+                                        :triggerChange="false" :dictCode="'cert_category'"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24">
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('WhetherMergeParameters')">{{$t('WhetherMergeParameters')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" prop="combineFlag">
+                    <a-radio-group style="margin-top: 2px" @change="flagChange" class="box-input" v-model="formInline.combineFlag">
+                      <a-radio value="1">
+                        {{$t('nonjoinder')}}
+                      </a-radio>
+                      <a-radio value="2">
+                        {{$t('merge')}}
+                      </a-radio>
+                    </a-radio-group>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24">
+              <a-col :span="24">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required" v-if='required'>*</span>
+                <span class="title-text-text"
+                      :title="$t('MergeSeparator')">{{$t('MergeSeparator')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" :prop="'description'">
+                    <a-input class="box-input"
+                             :disabled="disabled"
+                             v-model="formInline.separator"
+                             :placeholder="$t('PleaseEnter')+$t('MergeSeparator')"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+            </a-row>
+          </a-form-model>
+        </a-form>
+      </a-spin>
+      <div class="drawer-bootom-button">
+        <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
+        <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('export')}}</a-button>
+      </div>
+    </a-modal>
+    <uploadFileChange ref="uploadFile" :accept="'.doc,.doxc,.xls,.xlsx'" @uploadSuccess="uploadSuccess"></uploadFileChange>
+  </div>
+</template>
+
+<script>
+import PersonnelSelection from '@/components/PersonnelSelection/index'
+import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
+import uploadFileChange from '@/components/uploadFileChange/file'
+
+export default {
+  name: 'addModel',
+  components: {
+    uploadFileChange,
+    PersonnelSelection
+  },
+  props: ['url'],
+  data() {
+    return {
+      formInline: {
+      },
+      confirmLoading: false,
+      description:false,
+      dictOptions:[],
+      visible: false,
+      required:false,
+      rules: {
+        MergeSeparator:[
+          { required: true, message: this.$t('PleaseEnter')+this.$t('MergeSeparator'), trigger: 'change' },
+          { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('MergeSeparator'), trigger: 'blur' },
+        ],
+        description:[
+          { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
+        ],
+        status: [
+          { required: true, message: this.$t('PleaseSelect')+this.$t('status'), trigger: 'change' },
+        ],
+        fileConnectId: [
+          { required: true, message: this.$t('PleaseSelect')+this.$t('attachmentTemplate'), trigger: 'change' },
+        ],
+      },
+      disabled: false,
+      projectNameList: [],
+      title: ''
+    }
+  },
+  mounted() {
+    this.getNameList()
+  },
+  methods: {
+    uploadSuccess(data) {
+      let attIdList = []
+      if (data && data.length > 0) {
+        data.map(item => {
+          attIdList.push(item.id || data.name)
+        })
+      }
+      this.$refs.uploadFile.visible = false
+      /** 赋值给当前对应的表单文件 */
+      this.formInline.fileConnectId = attIdList.join(',')
+      this.formInline = { ...this.formInline }
+    },
+    clickButtonToUpload(item) {
+      this.$refs.uploadFile.visible = true
+      getAction('sys/common/getFileInfos', { id: this.formInline.fileConnectId }).then((res) => {
+        if (res.success) {
+          this.$refs.uploadFile.perentHandleFunc(res.result)
+        } else {
+          this.$refs.uploadFile.perentHandleFunc()
+        }
+      })
+    },
+    flagChange(value){
+      console.log(value.target.value)
+      if(value.target.value == 2){
+        this.required = true
+        this.description = true
+      }else{
+        this.required = false
+        this.description = false
+      }
+    },
+    getNameList() {
+      getAction('project/projectNameInfoEO/list', {}).then((res) => {
+        if (res.success) {
+          this.projectNameList = res.result || []
+        } else {
+          this.projectNameList = []
+        }
+      })
+    },
+    addModel() {
+      this.visible = true
+      this.title = this.$t('ConventionalExport')
+      this.formInline = {}
+      this.formInline.separator = ','
+      this.formInline = {...this.formInline}
+      this.getConfigure()
+      this.$nextTick(() => {
+        this.$refs['ruleForm'].clearValidate()
+      })
+    },
+    getConfigure(){
+      let pram = {
+        paramsManifestId: this.$route.query.id
+      }
+      getAction('report/detail/getConfigLabelList', pram).then((res) => {
+        if (res.success) {
+          console.log(res.result)
+          this.dictOptions = res.result
+        } else {
+          // this.$refs.uploadFile.perentHandleFunc()
+        }
+      })
+    },
+    editModel(value) {
+      this.visible = true
+      this.title = '编辑'
+      this.$nextTick(() => {
+        this.formInline = value
+      })
+    },
+    handleCancel() {
+      this.visible = false
+    },
+    certCategoryName(value){
+      getAction('sys/dict/getDictItems/cert_category', { }).then((res) => {
+        if (res.success) {
+          let tt = ''
+          res.result.forEach((item) => {
+            if(item.value == value){
+              tt=item.title
+            }
+          })
+          this.contentListStart = tt
+          console.log(this.contentListStart)
+        }
+      })
+      console.log(value)
+    },
+    handleSubmit() {
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          let url = this.url.ConventionalExport
+          let Action = getAction
+          let query = JSON.parse(JSON.stringify(this.formInline))
+          Object.keys(query).forEach(res => {
+            if (query[res] && query[res] instanceof Array) {
+              query[res] = query[res].join(',')
+            }
+          })
+          if(this.contentListStart){
+            query.certCategoryName = this.contentListStart
+          }
+          query.paramsManifestId = this.$route.query.id
+          this.confirmLoading = true
+          downloadFile('report/detail/exportNormal', this.$t('GeneralExportInformation')+'.zip', query)
+          this.confirmLoading = false
+        }
+      })
+    },
+    handleInput(value) {
+      this.$nextTick(() => {
+        this.formInline = { ...this.formInline }
+        this.$refs.ruleForm.validateField([value])
+      })
+    },
+    PersonnelSelectionChange(value, id) {
+      this.formInline[value] = id
+      this.formInline = { ...this.formInline }
+    },
+    projectNameChange(value){
+      console.log(value)
+    },
+  }
+}
+</script>
+<style>
+.formAdd .ant-form-item-label {
+  width: 130px;
+}
+
+.formAdd .ant-form-item-control-wrapper {
+  display: inline-block;
+  width: 100%;
+}
+
+/*.formAdd .ant-form-item {*/
+/*  margin-bottom: 20px;*/
+/*}*/
+
+.itemModel .ant-form-item-control-wrapper {
+  width: 100%;
+}
+
+.box-input .ant-select-selection--single {
+  height: 38px;
+}
+
+.box-input .ant-select-selection--multiple {
+  height: 38px;
+}
+
+.box-input .ant-select-selection__rendered {
+  line-height: 38px;
+  height: 38px;
+}
+
+.box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
+  margin-top: 6px;
+}
+
+.box-input .ant-calendar-picker {
+  line-height: 38px;
+  height: 38px;
+}
+
+.box-input .ant-calendar-picker-input {
+  height: 38px;
+}
+
+.box-input .ant-input-number-input-wrap {
+  line-height: 38px;
+  height: 38px;
+}
+</style>
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  /*align-items: center;*/
+}
+
+.title-text {
+  width: 114px;
+  text-align: right;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 48px;
+}
+
+.box-input {
+  display: inline-block;
+  height: 38px;
+  width: 100%;
+}
+
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
+
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+
+.title-text-text {
+  margin-top: 9px;
+}
+
+
+.formAdd {
+  margin-bottom: 40px;
+}
+
+
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  z-index:100;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+/deep/.add-input{
+  min-height: 135px!important;
+}
+</style>
+<style>
+.ant-input-disabled {
+  color: rgba(0, 0, 0, 0.65) !important;
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue
new file mode 100644
index 000000000..9496747a7
--- /dev/null
+++ b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue
@@ -0,0 +1,358 @@
+<template>
+  <div>
+    <a-drawer
+      :title="title"
+      :maskClosable="false"
+      :width="1000"
+      placement="right"
+      :closable="true"
+      @close="handleCancel"
+      :visible="visible"
+      style="height: 100%;overflow: auto;padding-bottom: 53px;">
+      <a-spin :spinning="confirmLoading">
+        <a-form>
+          <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+            <a-row :gutter="24">
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required">*</span>
+                    <span class="title-text-text"
+                          :title="$t('parameterTemplate')">{{$t('parameterTemplate')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" prop="templateName">
+                    <a-input class="box-input"
+                             :disabled="disabled"
+                             v-model="formInline.templateName"
+                             :placeholder="$t('PleaseEnter')+$t('templateName')"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required">*</span>
+                    <span class="title-text-text" :title="$t('status')">{{$t('status')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" prop="state">
+                    <a-select allowClear :placeholder="$t('PleaseSelect')+$t('status')" v-model='formInline.state'>
+                      <a-select-option :key="'0'" :value="'0'">{{$t('Enable')}}
+                      </a-select-option>
+                      <a-select-option :key="'1'" :value="'1'">{{$t('disable')}}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24">
+              <a-col :span="24">
+                <div class="box-title-text">
+                  <div class="title-text">
+
+                <span class="title-text-text"
+                      :title="$t('contentDescription')">{{$t('contentDescription')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" prop="description">
+                    <a-input class="box-input add-input"
+                             type="textarea"
+                             :disabled="disabled"
+                             v-model="formInline.description"
+                             :placeholder="$t('PleaseEnter')+$t('contentDescription')"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24">
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required">*</span>
+                    <span class="title-text-text"
+                          :title="$t('attachmentTemplate')">{{$t('attachmentTemplate')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" prop="fileConnectId">
+                    <a-button type="primary" class="button-text"
+                              v-model='formInline.fileConnectId'
+                              @click="clickButtonToUpload('fileTemplateConnectId')">
+                      {{ (formInline.fileConnectId === 'null' || formInline.fileConnectId === '' ||
+                      formInline.fileConnectId == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
+                    </a-button>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+            </a-row>
+          </a-form-model>
+        </a-form>
+      </a-spin>
+      <div class="drawer-bootom-button">
+        <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
+        <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+      </div>
+    </a-drawer>
+    <uploadFileChange ref="uploadFile" :accept="'.doc,.doxc,.xls,.xlsx'" @uploadSuccess="uploadSuccess"></uploadFileChange>
+  </div>
+</template>
+
+<script>
+import PersonnelSelection from '@/components/PersonnelSelection/index'
+import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
+import uploadFileChange from '@/components/uploadFileChange/file'
+
+export default {
+  name: 'addModel',
+  components: {
+    uploadFileChange,
+    PersonnelSelection
+  },
+  props: ['url'],
+  data() {
+    return {
+      formInline: {},
+      confirmLoading: false,
+      visible: false,
+      rules: {
+        templateName:[
+          { required: true, message: this.$t('PleaseEnter')+this.$t('parameterTemplate'), trigger: 'change' },
+          { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('characters'), trigger: 'blur' },
+        ],
+        description:[
+          { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
+        ],
+        status: [
+          { required: true, message: this.$t('PleaseSelect')+this.$t('status'), trigger: 'change' },
+        ],
+        fileConnectId: [
+          { required: true, message: this.$t('PleaseSelect')+this.$t('attachmentTemplate'), trigger: 'change' },
+        ],
+      },
+      disabled: false,
+      projectNameList: [],
+      title: ''
+    }
+  },
+  mounted() {
+    this.getNameList()
+  },
+  methods: {
+    uploadSuccess(data) {
+      let attIdList = []
+      if (data && data.length > 0) {
+        data.map(item => {
+          attIdList.push(item.id || data.name)
+        })
+      }
+      this.$refs.uploadFile.visible = false
+      /** 赋值给当前对应的表单文件 */
+      this.formInline.fileConnectId = attIdList.join(',')
+      this.formInline = { ...this.formInline }
+    },
+    clickButtonToUpload(item) {
+      this.$refs.uploadFile.visible = true
+      getAction('sys/common/getFileInfos', { id: this.formInline.fileConnectId }).then((res) => {
+        if (res.success) {
+          this.$refs.uploadFile.perentHandleFunc(res.result)
+        } else {
+          this.$refs.uploadFile.perentHandleFunc()
+        }
+      })
+    },
+    getNameList() {
+      getAction('project/projectNameInfoEO/list', {}).then((res) => {
+        if (res.success) {
+          this.projectNameList = res.result || []
+        } else {
+          this.projectNameList = []
+        }
+      })
+    },
+    addModel() {
+      this.visible = true
+      this.title = this.$t('CustomExport')
+      this.formInline = {}
+      this.formInline.state = '0'
+      this.formInline = {...this.formInline}
+      this.$nextTick(() => {
+        this.$refs['ruleForm'].clearValidate()
+      })
+    },
+    editModel(value) {
+      this.visible = true
+      this.title = '编辑'
+      this.$nextTick(() => {
+        this.formInline = value
+      })
+    },
+    handleCancel() {
+      this.visible = false
+    },
+    handleSubmit() {
+      if(this.formInline.paramsTemplateName !== undefined) {
+        this.formInline.paramsTemplateName = this.formInline.paramsTemplateName.trim()
+      }
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          let url = ''
+          let Action
+          if (this.formInline.id) {
+            url = this.url.edit
+            Action = postAction
+          } else {
+            url = this.url.add
+            Action = postAction
+          }
+          let query = JSON.parse(JSON.stringify(this.formInline))
+          Object.keys(query).forEach(res => {
+            if (query[res] && query[res] instanceof Array) {
+              query[res] = query[res].join(',')
+            }
+          })
+          this.confirmLoading = true
+          Action(url, query).then((res) => {
+            if (res.success) {
+              this.confirmLoading = false
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.visible = false
+              this.$emit('addModelList')
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+              this.confirmLoading = false
+            }
+          })
+        }
+      })
+    },
+    handleInput(value) {
+      this.$nextTick(() => {
+        this.formInline = { ...this.formInline }
+        this.$refs.ruleForm.validateField([value])
+      })
+    },
+    PersonnelSelectionChange(value, id) {
+      this.formInline[value] = id
+      this.formInline = { ...this.formInline }
+    },
+    projectNameChange(value){
+      console.log(value)
+    },
+  }
+}
+</script>
+<style>
+.formAdd .ant-form-item-label {
+  width: 130px;
+}
+
+.formAdd .ant-form-item-control-wrapper {
+  display: inline-block;
+  width: 100%;
+}
+
+/*.formAdd .ant-form-item {*/
+/*  margin-bottom: 20px;*/
+/*}*/
+
+.itemModel .ant-form-item-control-wrapper {
+  width: 100%;
+}
+
+.box-input .ant-select-selection--single {
+  height: 38px;
+}
+
+.box-input .ant-select-selection--multiple {
+  height: 38px;
+}
+
+.box-input .ant-select-selection__rendered {
+  line-height: 38px;
+  height: 38px;
+}
+
+.box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
+  margin-top: 6px;
+}
+
+.box-input .ant-calendar-picker {
+  line-height: 38px;
+  height: 38px;
+}
+
+.box-input .ant-calendar-picker-input {
+  height: 38px;
+}
+
+.box-input .ant-input-number-input-wrap {
+  line-height: 38px;
+  height: 38px;
+}
+</style>
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  /*align-items: center;*/
+}
+
+.title-text {
+  width: 114px;
+  text-align: right;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 48px;
+}
+
+.box-input {
+  display: inline-block;
+  height: 38px;
+  width: 100%;
+}
+
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
+
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+
+.title-text-text {
+  margin-top: 9px;
+}
+
+
+.formAdd {
+  margin-bottom: 40px;
+}
+
+
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  z-index:100;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+/deep/.add-input{
+  min-height: 135px!important;
+}
+</style>
+<style>
+.ant-input-disabled {
+  color: rgba(0, 0, 0, 0.65) !important;
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue
index 6b6852905..6d768d1fa 100644
--- a/jero-web/src/views/parameter/managementdetails/index.vue
+++ b/jero-web/src/views/parameter/managementdetails/index.vue
@@ -4,7 +4,7 @@
       <div class="Virtual-detail-header" style="top: 0">
         <div class="Virtual-detail-title">
               <span>
-                {{ $t('ParameteItemCollectionList') }}
+                {{ $t('ParameterViewPage') }}
               </span>
         </div>
       </div>
@@ -12,6 +12,17 @@
       <div class='Virtual-detail-content' style='margin-top: 15px'>
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row :gutter="24" style='margin-left: -90px;'>
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('certificationCategory')">
+                  <span>{{$t('certificationCategory')}}</span>
+                </div>
+                <j-multi-select-tag class="box-input" v-model="formInline.certCategory"
+                                   :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
+                                   :type="'select'"
+                                   :triggerChange="false" :dictCode="'cert_category'"/>
+              </div>
+            </a-col>
             <a-col :md="6" :sm="8">
               <div class="box-title-text">
                 <div class="title-text" :title="$t('NiONumber')">
@@ -30,35 +41,24 @@
                          v-model="formInline.paramsName"></a-input>
               </div>
             </a-col>
-            <a-col :md="6" :sm="8">
-              <div class="box-title-text">
-                <div class="title-text" :title="$t('certificationCategory')">
-                  <span>{{$t('certificationCategory')}}</span>
-                </div>
-                <j-dict-select-tag class="box-input" v-model="formInline.certCategory"
-                                   :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'cert_category'"/>
-              </div>
-            </a-col>
-            <a-col :md="6" :sm="8">
-              <div class="box-title-text">
-                <div class="title-text" :title="$t('areaOfResponsibility')">
-                  <span>{{$t('areaOfResponsibility')}}</span>
-                </div>
-                <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
-                                   :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'duty_territory'"/>
-              </div>
-            </a-col>
             <a-col :md="6" :sm="8">
               <div class="box-title-text">
                 <div class="title-text" :title="$t('completedBy')">
                   <span>{{$t('completedBy')}}</span>
                 </div>
-                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('completedBy')"
-                         v-model="formInline.dre"></a-input>
+                <a-input class="box-input" :placeholder="$t('PleaseSelect')+$t('completedBy')"
+                         @input="getcompleteby($event)"
+                         v-model="formInline.completedBy"></a-input>
+              </div>
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('engineeringInterfacePerson')">
+                  <span>{{$t('engineeringInterfacePerson')}}</span>
+                </div>
+                <a-input class="box-input" :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
+                         @input="getcompleteby($event)"
+                         v-model="formInline.completedBy"></a-input>
               </div>
             </a-col>
             <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
@@ -71,6 +71,16 @@
         </a-form>
       </div>
     </div>
+    <div class="table-operator">
+      <div @click="ConventionalExport" class="operator-text" v-has="'params:template:add'">
+<!--        <a-icon type="plus"/>-->
+        {{$t('ConventionalExport')}}
+      </div>
+      <div @click="CustomExport" class="operator-text" v-has="'params:template:delete'">
+<!--        <a-icon type="delete"/>-->
+        {{$t('CustomExport')}}
+      </div>
+    </div>
     <div>
       <a-table
         ref="table"
@@ -103,16 +113,24 @@
         @showSizeChange="SizeChange"
       />
     </div>
+    <conventionalModel :url="url" ref="conventionalModel"/>
+    <customelModel :url="url" ref="customelModel"/>
   </a-card>
 </template>
 
 <script>
 import { getAction,postAction } from '../../../api/manage'
 import axios from 'axios'
+import conventionalModel from './commponts/conventionalmodle'
+import customelModel from './commponts/customexportmodle'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
 import Vue from 'vue'
 export default {
   name: 'managementdetails',
+  components: {
+    conventionalModel,
+    customelModel
+  },
   data(){
     return{
       columns:[],
@@ -121,7 +139,7 @@ export default {
       url: {
         tableHeader: 'report/detail/getHeader',
         tableList: 'report/detail/list',
-        // add: 'params/collectManifest/submit',
+        ConventionalExport: 'report/detail/exportNormal',
         // getLoginUserType: 'params/collectManifest/getLoginUserType', // 获取当前登陆人
         // getquerySdtList: 'params/collectManifest/querySdtList', // 获取工程接口人的列表
         // updateSdt: 'params/collectManifest/updateSdt', // 提交工程接口人
@@ -237,18 +255,22 @@ export default {
         }
       })
     },
+    getcompleteby(e){
+      console.log(e)
+    },
     getTableList() {
       // console.log('this.searchParmestable',this.searchParmes)
       let pageNo = JSON.parse(JSON.stringify(this.pageNo))
       let pageSize = JSON.parse(JSON.stringify(this.pageSize))
       let params = {
-        ...this.searchParmes,
+        ...this.formInline,
+        paramsManifestId: this.$route.query.id,
         pageNo: pageNo + '',
         pageSize: pageSize + ''
       }
       // console.log('parmsss',params)
       this.loading = true
-      getAction(this.url.tableList, {paramsManifestId: this.$route.query.id}).then((res) => {
+      getAction(this.url.tableList, params).then((res) => {
         if (res.success) {
           if (res.result.current > 1 && res.result.records.length == 0) {
             this.pageNo = res.result.current - 1
@@ -281,17 +303,20 @@ export default {
     listReset() {
       this.formInline = {}
     },
-    handleModule() {
-
+    ConventionalExport() {
+      this.$refs.conventionalModel.addModel()
     },
-    handleCody() {
+    CustomExport() {
+      this.$refs.customelModel.addModel()
     },
     searchQuery() {
       this.pageNo = 1
-      this.$refs.CollectionTabel.getTableList()
+      this.getTableList()
     },
     searchReset() {
-      this.$refs.CollectionTabel.getTableListReset()
+      this.pageNo = 1
+      this.formInline = {}
+      this.getTableList()
     },
     pageOnChange() {
 
diff --git a/jero-web/src/views/parameter/parameterexport/components/addModel.vue b/jero-web/src/views/parameter/parameterexport/components/addModel.vue
index 367f428f8..4565b1a46 100644
--- a/jero-web/src/views/parameter/parameterexport/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterexport/components/addModel.vue
@@ -49,6 +49,7 @@
               <a-col :span="24">
                 <div class="box-title-text">
                   <div class="title-text">
+
                 <span class="title-text-text"
                       :title="$t('contentDescription')">{{$t('contentDescription')}}</span>
                   </div>
@@ -66,11 +67,13 @@
               <a-col :span="12">
                 <div class="box-title-text">
                   <div class="title-text">
+                    <span class="Required">*</span>
                 <span class="title-text-text"
                       :title="$t('attachmentTemplate')">{{$t('attachmentTemplate')}}</span>
                   </div>
-                  <a-form-model-item class="itemModel" prop="paramsTemplateName">
+                  <a-form-model-item class="itemModel" prop="fileConnectId">
                     <a-button type="primary" class="button-text"
+                              v-model='formInline.fileConnectId'
                               @click="clickButtonToUpload('fileTemplateConnectId')">
                       {{ (formInline.fileConnectId === 'null' || formInline.fileConnectId === '' ||
                       formInline.fileConnectId == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
@@ -87,7 +90,7 @@
         <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
       </div>
     </a-drawer>
-    <uploadFileChange ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFileChange>
+    <uploadFileChange ref="uploadFile" :accept="'.doc,.doxc,.xls,.xlsx'" @uploadSuccess="uploadSuccess"></uploadFileChange>
   </div>
 </template>
 
@@ -119,6 +122,9 @@ export default {
         status: [
           { required: true, message: this.$t('PleaseSelect')+this.$t('status'), trigger: 'change' },
         ],
+        fileConnectId: [
+          { required: true, message: this.$t('PleaseSelect')+this.$t('attachmentTemplate'), trigger: 'change' },
+        ],
       },
       disabled: false,
       projectNameList: [],
@@ -143,7 +149,7 @@ export default {
     },
     clickButtonToUpload(item) {
       this.$refs.uploadFile.visible = true
-      getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+      getAction('sys/common/getFileInfos', { id: this.formInline.fileConnectId }).then((res) => {
         if (res.success) {
           this.$refs.uploadFile.perentHandleFunc(res.result)
         } else {
@@ -190,7 +196,7 @@ export default {
           let Action
           if (this.formInline.id) {
             url = this.url.edit
-            Action = putAction
+            Action = postAction
           } else {
             url = this.url.add
             Action = postAction

From ab1dfcba6c503d952263002daa7c89d851b328fd Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 4 Jul 2022 17:01:26 +0800
Subject: [PATCH 20/31] =?UTF-8?q?=E6=B3=95=E8=A7=84=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jero/config/shiro/ShiroConfig.java      | 2 ++
 .../java/com/jero/modules/wkflow/entity/TaskCommonQuery.java  | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
index fe23ed6d2..c68350d46 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
@@ -143,6 +143,8 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/project/projectLawsInventoryEO/processCall", "anon"); // 项目库-法规清单 工作流处理数据接口排除
         filterChainDefinitionMap.put("/project/projectTaskInventoryEO/processCall", "anon"); // 项目库-任务清单 工作流处理数据接口排除
         filterChainDefinitionMap.put("/wkflow/processHistoryEO/processCall", "anon"); // 流程历史 工作流处理数据接口排除
+        filterChainDefinitionMap.put("/lawsOpinionGather/lawsOpinionGatherEO/processCall", "anon"); // 法规收集表 工作流处理数据接口排除
+        filterChainDefinitionMap.put("/lawsOpinionGather/lawsProcessHistoryEO/processCall", "anon"); // 法规收集历史 工作流处理数据接口排除
         filterChainDefinitionMap.put("/sys/user/querySysUserListByIdList", "anon"); // 工作流根据用户idList获取用户信息接口
 
         // 添加自己的过滤器并且取名为jwt
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java
index e5f56b9ed..27ed1817a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java
@@ -43,7 +43,9 @@ public class TaskCommonQuery {
 	private String prcNum;
 
 	@ApiModelProperty(value = "流程类型")
-	private String prcType = FlowTypeEnum.RWQRLC.getValue();
+	private String prcType;
+
+	private String prcTypes = FlowTypeEnum.RWQRLC.getValue() + "," + FlowTypeEnum.FGYJSJLC.getValue();
 
 	@ApiModelProperty(value = "高级搜索字符串")
 	private String advanceSearchVOStr;

From 8fa718fe6a4ec083accb53b52c50d4ccfabc651e Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Mon, 4 Jul 2022 17:29:13 +0800
Subject: [PATCH 21/31] =?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-bug55353?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsCollectManifestEOServiceImpl.java    | 12 ++++++++++--
 .../ParamsCollectManifestHistoryEOServiceImpl.java  | 13 +++++++++++--
 .../impl/ParamsReportDetailEOServiceImpl.java       | 13 +++++++++++--
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 5a58faa75..48813b4fd 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
@@ -1660,8 +1660,16 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				field.setAccessible(true);
 				// 获取在对象f中属性fields[i]对应的对象中的变量
 				Object o = field.get(obj);
-				if (o != null)
-					map.put(varName, o);
+				if (o != null) {
+					if (Date.class.equals(field.getType())) {
+						Date date = (Date) o;
+						SimpleDateFormat formatter=new SimpleDateFormat("yyyy-MM-dd");
+						String time=formatter.format(date);
+						map.put(varName, time);
+					} else {
+						map.put(varName, o);
+					}
+				}
 				// 恢复访问控制权限
 				field.setAccessible(accessFlag);
 			} catch (IllegalArgumentException ex) {
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
index 19c26fc2a..6751543e1 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
@@ -28,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.lang.reflect.Field;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -497,8 +498,16 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
 				field.setAccessible(true);
 				// 获取在对象f中属性fields[i]对应的对象中的变量
 				Object o = field.get(obj);
-				if (o != null)
-					map.put(varName, o);
+				if (o != null) {
+					if (Date.class.equals(field.getType())) {
+						Date date = (Date) o;
+						SimpleDateFormat formatter=new SimpleDateFormat("yyyy-MM-dd");
+						String time=formatter.format(date);
+						map.put(varName, time);
+					} else {
+						map.put(varName, o);
+					}
+				}
 				// 恢复访问控制权限
 				field.setAccessible(accessFlag);
 			} catch (IllegalArgumentException ex) {
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 d610dc012..5a763aa38 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
@@ -69,6 +69,7 @@ import java.lang.reflect.Field;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -905,8 +906,16 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 				field.setAccessible(true);
 				// 获取在对象f中属性fields[i]对应的对象中的变量
 				Object o = field.get(obj);
-				if (o != null)
-					map.put(varName, o);
+				if (o != null) {
+					if (Date.class.equals(field.getType())) {
+						Date date = (Date) o;
+						SimpleDateFormat formatter=new SimpleDateFormat("yyyy-MM-dd");
+						String time=formatter.format(date);
+						map.put(varName, time);
+					} else {
+						map.put(varName, o);
+					}
+				}
 				// 恢复访问控制权限
 				field.setAccessible(accessFlag);
 			} catch (IllegalArgumentException ex) {

From 0f5b9f69895ba84d1696e6b5fb3be70a8edfe880 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 4 Jul 2022 17:43:54 +0800
Subject: [PATCH 22/31] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E5=AF=BC=E5=87=BA=E5=8E=86=E5=8F=B2=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/exporthistory/index.vue    | 65 ++++++++-----------
 .../parameter/escalationlibrary/index.vue     |  8 ++-
 .../commponts/conventionalmodle.vue           | 32 ++++++---
 .../parameter/managementdetails/index.vue     | 28 ++++++--
 4 files changed, 75 insertions(+), 58 deletions(-)

diff --git a/jero-web/src/components/exporthistory/index.vue b/jero-web/src/components/exporthistory/index.vue
index db26b4bd1..181fb0c2b 100644
--- a/jero-web/src/components/exporthistory/index.vue
+++ b/jero-web/src/components/exporthistory/index.vue
@@ -43,9 +43,10 @@
       :scroll='{x: 600}'
       :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
       @change='handleTableChange'>
-      <span slot='click' slot-scope='text, record'>
-          <a class='action-edit' @click='editArea(record)' v-has="'area:edit'">{{ text }}</a>
-      </span>
+
+      <template slot="file" slot-scope="text, record">
+        <a class="action-edit" href="javascript:;" @click="dowloadfile(record)" v-has="'bqnrzdpzxlbj'">{{record.exportFileName}}</a>
+      </template>
     </a-table>
     <div class="page" style='display: flex;justify-content: flex-end;'>
       <a-pagination
@@ -59,15 +60,15 @@
         @showSizeChange="SizeChange"
       />
     </div>
-    <div class='drawer-bootom-button'>
-      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>
-      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>
-    </div>
+<!--    <div class='drawer-bootom-button'>-->
+<!--      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>-->
+<!--      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>-->
+<!--    </div>-->
   </div>
 </template>
 
 <script>
-import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
+import { putAction, postAction, getAction, deleteAction ,downloadFile } from '@/api/manage'
 import axios from 'axios'
 import Vue from 'vue'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
@@ -100,19 +101,20 @@ export default {
         {
           title: this.$t('Exporttype'),
           align: 'center',
-          dataIndex: 'paramsTemplateName',
+          dataIndex: 'exportType',
           ellipsis: true
         },
         {
           title: this.$t('Exporttime'),
           align: 'center',
-          dataIndex: 'paramsTemplateName',
+          dataIndex: 'exportTime',
           ellipsis: true
         },
         {
           title: this.$t('file'),
           align: 'center',
-          dataIndex: 'paramsTemplateName',
+          dataIndex: 'exportFileName',
+          scopedSlots: { customRender: 'file' },
           ellipsis: true
         }
       ],
@@ -154,6 +156,11 @@ export default {
       default: '',
       require: true
     },
+    paramsManifestId: {
+      type: String,
+      default: '',
+      require: true
+    },
     url: {
       type: Object,
       default: '',
@@ -194,43 +201,23 @@ export default {
       this.pageSize = pageSize
       this.loadData()
     },
+    dowloadfile(item){
+      downloadFile('/sys/common/downLoadFile', item.exportFileName, {id:item.exportFileId})
+    },
     loadData() {
       let _this = this
       let params = {
         pageNo: this.pageNo,
         pageSize: this.pageSize,
+        paramsManifestId:this.paramsManifestId,
         ...this.formData
       }
-      this.loading = true
-      axios({
-        url: `/jero-boot/params/manifest/getAllManifest`,
-        method: 'post',
-        data: params,
-        transformRequest: [function (data) {
-          let ret = ''
-          for (let it in data) {
-            ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
-          }
-          return ret
-        }],
-        headers: {
-          'Content-Type': 'application/x-www-form-urlencoded',
-          'X-Access-Token':_this.token
+      getAction('params/report/exportHistoryPage', params).then((res) => {
+        if (res.success) {
+          this.areaTable = res.result.records
+          this.total = res.result.total
         }
       })
-        .then( (res) =>{
-          if (res.data.success) {
-            console.log(res.data)
-            this.loading = false
-            this.areaTable = res.data.result.records || []
-            this.total = res.data.result.total
-          }else{
-            this.loading = false
-          }
-        })
-        .catch( (error) =>{
-          console.log(error);
-        });
     },
     searchQuery() {
       this.loadData()
diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue
index 9e6980950..6effd1f5c 100644
--- a/jero-web/src/views/parameter/escalationlibrary/index.vue
+++ b/jero-web/src/views/parameter/escalationlibrary/index.vue
@@ -67,7 +67,7 @@
     </div>
     <!--     导出历史模板-->
     <a-modal class="show-drawer" :title="titleTag" width="900px" v-model="drawerVisible" :footer="null">
-      <export-history v-if='drawerVisible' @areaVisible='drawerVisible = false'></export-history>
+      <export-history v-if='drawerVisible' @areaVisible='drawerVisible = false' :paramsManifestId='paramsManifestId'></export-history>
     </a-modal>
   </a-card>
 </template>
@@ -91,6 +91,7 @@
         loading: false,
         toggleSearchStatus: false,
         selectedRowKeys: [],
+        paramsManifestId:'',
         selectedRowKeysArray: '',
         formInline: {},
         rules: {
@@ -173,9 +174,10 @@
         this.selectedRowKeys = value
         this.selectedRowKeysArray = this.selectedRowKeys.join(',')
       },
-      // 复制
-      handlecody() {
+      // 导出历史
+      handlecody(e) {
         this.drawerVisible = true
+        this.paramsManifestId = e.id
       },
       hideModal() {
         this.visible = false
diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
index 53cd8c84b..e61148de4 100644
--- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
+++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
@@ -19,7 +19,7 @@
                   <div class="title-text" :title="$t('certificationCategory')">
                     <span>{{$t('certificationCategory')}}</span>
                   </div>
-                  <a-form-model-item class="itemModel" prop="certificationCategory">
+                  <a-form-model-item class="itemModel" prop="certCategory">
                     <j-dict-select-tag class="box-input" v-model="formInline.certCategory"
                                        :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
                                        :type="'select'"
@@ -37,7 +37,7 @@
                   <div class="title-text" :title="$t('configure')">
                     <span>{{$t('configure')}}</span>
                   </div>
-                  <a-form-model-item class="itemModel" prop="configure">
+                  <a-form-model-item class="itemModel" prop="configIds">
                     <j-multi-select-tag class="box-input" v-model="formInline.configIds"
                                         :options="dictOptions"
                                         :placeholder="$t('PleaseSelect')+$t('configure')"
@@ -75,9 +75,10 @@
                 <span class="title-text-text"
                       :title="$t('MergeSeparator')">{{$t('MergeSeparator')}}</span>
                   </div>
-                  <a-form-model-item class="itemModel" :prop="'description'">
+                  <a-form-model-item class="itemModel" :prop="this.disabled == true?'separator':''">
+<!--                    :disabled="disabled"-->
                     <a-input class="box-input"
-                             :disabled="disabled"
+
                              v-model="formInline.separator"
                              :placeholder="$t('PleaseEnter')+$t('MergeSeparator')"/>
                   </a-form-model-item>
@@ -117,10 +118,23 @@ export default {
       dictOptions:[],
       visible: false,
       required:false,
+      disabled:false,
       rules: {
-        MergeSeparator:[
+        separator:[
           { required: true, message: this.$t('PleaseEnter')+this.$t('MergeSeparator'), trigger: 'change' },
-          { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('MergeSeparator'), trigger: 'blur' },
+          // { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('MergeSeparator'), trigger: 'blur' },
+        ],
+        certCategory:[
+          { required: true, message: this.$t('PleaseEnter')+this.$t('certificationCategory'), trigger: 'change' },
+          // { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('MergeSeparator'), trigger: 'blur' },
+        ],
+        combineFlag:[
+          { required: true, message: this.$t('PleaseSelect')+this.$t('WhetherMergeParameters'), trigger: 'change' },
+          // { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('MergeSeparator'), trigger: 'blur' },
+        ],
+        configIds:[
+          { required: true, message: this.$t('PleaseSelect')+this.$t('configure'), trigger: 'change' },
+          // { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('MergeSeparator'), trigger: 'blur' },
         ],
         description:[
           { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
@@ -132,7 +146,6 @@ export default {
           { required: true, message: this.$t('PleaseSelect')+this.$t('attachmentTemplate'), trigger: 'change' },
         ],
       },
-      disabled: false,
       projectNameList: [],
       title: ''
     }
@@ -167,10 +180,10 @@ export default {
       console.log(value.target.value)
       if(value.target.value == 2){
         this.required = true
-        this.description = true
+        this.disabled = true
       }else{
         this.required = false
-        this.description = false
+        this.disabled = false
       }
     },
     getNameList() {
@@ -215,6 +228,7 @@ export default {
     },
     handleCancel() {
       this.visible = false
+      this.$refs.ruleForm.resetFields()
     },
     certCategoryName(value){
       getAction('sys/dict/getDictItems/cert_category', { }).then((res) => {
diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue
index d3b785d6e..723c4c40a 100644
--- a/jero-web/src/views/parameter/managementdetails/index.vue
+++ b/jero-web/src/views/parameter/managementdetails/index.vue
@@ -46,9 +46,13 @@
                 <div class="title-text" :title="$t('completedBy')">
                   <span>{{$t('completedBy')}}</span>
                 </div>
-                <a-input class="box-input" :placeholder="$t('PleaseSelect')+$t('completedBy')"
-                         @input="getcompleteby($event)"
-                         v-model="formInline.completedBy"></a-input>
+                <PersonnelSelection
+                  :query="{db_field_name:'completedBy',db_field_txt:$t('completedBy')}"
+                  :isInput="true"
+                  class="box-input"
+                  :personneQuery="formInline"
+                  @change="PersonnelSelectionChange"
+                  v-model="formInline.dre"/>
               </div>
             </a-col>
             <a-col :md="6" :sm="8">
@@ -56,9 +60,13 @@
                 <div class="title-text" :title="$t('engineeringInterfacePerson')">
                   <span>{{$t('engineeringInterfacePerson')}}</span>
                 </div>
-                <a-input class="box-input" :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
-                         @input="getcompleteby($event)"
-                         v-model="formInline.completedBy"></a-input>
+                <PersonnelSelection
+                  :query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"
+                  :isInput="true"
+                  class="box-input"
+                  :personneQuery="formInline"
+                  @change="PersonnelSelectionChange"
+                  v-model="formInline.sdt"/>
               </div>
             </a-col>
             <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
@@ -125,12 +133,14 @@ import axios from 'axios'
 import conventionalModel from './commponts/conventionalmodle'
 import customelModel from './commponts/customexportmodle'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
+import PersonnelSelection from '@/components/PersonnelSelection/index'
 import Vue from 'vue'
 export default {
   name: 'managementdetails',
   components: {
     conventionalModel,
-    customelModel
+    customelModel,
+    PersonnelSelection
   },
   data(){
     return{
@@ -259,6 +269,10 @@ export default {
     getcompleteby(e){
       console.log(e)
     },
+    PersonnelSelectionChange(value, id) {
+      this.formInline[value] = id
+      this.formInline = { ...this.formInline }
+    },
     getTableList() {
       // console.log('this.searchParmestable',this.searchParmes)
       let pageNo = JSON.parse(JSON.stringify(this.pageNo))

From 53f97b5d62f188c7fc0f96782ae31281c951047f Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 4 Jul 2022 17:44:54 +0800
Subject: [PATCH 23/31] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...wsOpinionAssessmentResultEOController.java |  9 ++++++++-
 ...ILawsOpinionAssessmentResultEOService.java |  6 ++++++
 ...sOpinionAssessmentResultEOServiceImpl.java | 20 +++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

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 80885a019..54e97279b 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
@@ -35,7 +35,7 @@ import com.jero.common.aspect.annotation.AutoLog;
 public class LawsOpinionAssessmentResultEOController extends JeroController<LawsOpinionAssessmentResultEO, ILawsOpinionAssessmentResultEOService> {
 	@Autowired
 	private ILawsOpinionAssessmentResultEOService lawsOpinionAssessmentResultEOService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -167,4 +167,11 @@ public class LawsOpinionAssessmentResultEOController extends JeroController<Laws
         return super.importExcel(request, response, LawsOpinionAssessmentResultEO.class);
     }
 
+	 @AutoLog(value = "法规意见收集-评估结果表-添加")
+	 @ApiOperation(value="法规意见收集-评估结果表-添加", notes="法规意见收集-评估结果表-添加")
+	 @PostMapping(value = "/insertBatch")
+	 public Result<?> insertBatch(@Validated @RequestBody List<LawsOpinionAssessmentResultEO> lawsOpinionAssessmentResultEOList) {
+		 this.lawsOpinionAssessmentResultEOService.insertBatch(lawsOpinionAssessmentResultEOList);
+		 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 8be4646a9..97c166753 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
@@ -58,4 +58,10 @@ public interface ILawsOpinionAssessmentResultEOService extends IService<LawsOpin
 	 * @return
 	 */
     List<LawsOpinionAssessmentResultEO> queryList();
+
+	/**
+	 * 批量新增
+	 * @param lawsOpinionAssessmentResultEOList
+	 */
+    void insertBatch(List<LawsOpinionAssessmentResultEO> lawsOpinionAssessmentResultEOList);
 }
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 ee57a53d0..8549a230f 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,8 +1,12 @@
 package com.jero.modules.lawsOpinionGather.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO;
 import com.jero.modules.lawsOpinionGather.mapper.LawsOpinionAssessmentResultEOMapper;
 import com.jero.modules.lawsOpinionGather.service.ILawsOpinionAssessmentResultEOService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.Date;
@@ -86,4 +90,20 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
     public List<LawsOpinionAssessmentResultEO> queryList() {
         return list();
     }
+
+	@Override
+	public void insertBatch(List<LawsOpinionAssessmentResultEO> lawsOpinionAssessmentResultEOList) {
+		if (CollectionUtils.isNotEmpty(lawsOpinionAssessmentResultEOList)) {
+			LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+			LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO = lawsOpinionAssessmentResultEOList.get(0);
+			QueryWrapper<LawsOpinionAssessmentResultEO> deleteWrapper = new QueryWrapper<>();
+			deleteWrapper.lambda().eq(LawsOpinionAssessmentResultEO::getActiProcInstId,lawsOpinionAssessmentResultEO.getActiProcInstId());
+			deleteWrapper.lambda().eq(LawsOpinionAssessmentResultEO::getLawsOpinionGatherId,lawsOpinionAssessmentResultEO.getLawsOpinionGatherId());
+			deleteWrapper.lambda().eq(LawsOpinionAssessmentResultEO::getCreateBy,sysUser.getUsername());
+			this.baseMapper.delete(deleteWrapper);
+
+			this.saveBatch(lawsOpinionAssessmentResultEOList);
+		}
+	}
 }

From 8c36f0c2fa26c439a7ebfd3f3db0a5efaf2f0f85 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 4 Jul 2022 18:02:41 +0800
Subject: [PATCH 24/31] =?UTF-8?q?=E6=B3=95=E8=A7=84-=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=A1=A8-=E5=88=97=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsProcessHistoryEOController.java       |  7 +-
 .../entity/LawsProcessHistoryEO.java          |  7 ++
 .../enums/LawsOpinionGatherNodeEnum.java      | 61 ++++++++++++++++++
 .../enums/OperatorRoleCodeEnum.java           | 64 +++++++++++++++++++
 .../service/ILawsProcessHistoryEOService.java |  6 +-
 .../impl/LawsProcessHistoryEOServiceImpl.java | 28 +++++++-
 6 files changed, 168 insertions(+), 5 deletions(-)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/LawsOpinionGatherNodeEnum.java
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/OperatorRoleCodeEnum.java

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsProcessHistoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsProcessHistoryEOController.java
index 15ec36e61..cc9cd94a7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsProcessHistoryEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsProcessHistoryEOController.java
@@ -68,8 +68,11 @@ public class LawsProcessHistoryEOController extends JeroController<LawsProcessHi
 	@AutoLog(value = "法规-流程历史表-列表查询")
     @ApiOperation(value="法规-流程历史表-列表查询", notes="法规-流程历史表-列表查询")
 	@GetMapping(value = "/list")
-	public Result<List<LawsProcessHistoryEO>> queryList() {
-        List<LawsProcessHistoryEO> list = lawsProcessHistoryEOService.queryList();
+	public Result<List<LawsProcessHistoryEO>> queryList(LawsProcessHistoryEO lawsProcessHistoryEO,
+														HttpServletRequest req,
+														@RequestParam(value = "cut",defaultValue = "cn") String cut) {
+        List<LawsProcessHistoryEO> list = lawsProcessHistoryEOService.queryList(lawsProcessHistoryEO,req,cut);
+        this.lawsProcessHistoryEOService.disposeData(list,cut);
         return Result.OK(list);
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsProcessHistoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsProcessHistoryEO.java
index 6ac820d97..e7e09c63d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsProcessHistoryEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsProcessHistoryEO.java
@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -67,6 +68,9 @@ public class LawsProcessHistoryEO implements Serializable {
 	@Excel(name = "操作节点", width = 15)
     @ApiModelProperty(value = "操作节点")
     private String taskDefinitionKey;
+    //操作节点展示字段
+	@TableField(exist = false)
+    private String taskDefinitionKeyName;
 
 	/**操作人id*/
 	@Excel(name = "操作人id", width = 15)
@@ -77,6 +81,9 @@ public class LawsProcessHistoryEO implements Serializable {
 	@Excel(name = "操作角色编码", width = 15)
     @ApiModelProperty(value = "操作角色编码")
     private String operatorRoleCode;
+	//操作角色展示字段
+	@TableField(exist = false)
+    private String operatorRoleName;
 
 	/**操作时间*/
 	@Excel(name = "操作时间", width = 15, format = "yyyy-MM-dd")
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/LawsOpinionGatherNodeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/LawsOpinionGatherNodeEnum.java
new file mode 100644
index 000000000..27c8a75c2
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/LawsOpinionGatherNodeEnum.java
@@ -0,0 +1,61 @@
+package com.jero.modules.lawsOpinionGather.enums;
+
+import com.alibaba.druid.util.StringUtils;
+
+/**
+ * 法规意见收集 节点枚举类
+ */
+public enum LawsOpinionGatherNodeEnum {
+
+    ENGINEER_INITIATED("gcsfq","工程师发起","Engineer initiated"),
+    APPRAISERS_EVALUATION("pgrpg","评估人评估","Appraiser's evaluation"),
+    ;
+
+    String key;
+    String cnName;
+    String enName;
+
+    private LawsOpinionGatherNodeEnum(String key, String cnName, String enName) {
+        this.key = key;
+        this.cnName = cnName;
+        this.enName = enName;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getCnName() {
+        return cnName;
+    }
+
+    public void setCnName(String cnName) {
+        this.cnName = cnName;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+    public static String getTextByValue(String key,String cut) {
+        LawsOpinionGatherNodeEnum[] values = values();
+        for (LawsOpinionGatherNodeEnum lawsOpinionGatherNodeEnum : values) {
+            if (lawsOpinionGatherNodeEnum.key.equals(key)) {
+                if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+                    return lawsOpinionGatherNodeEnum.cnName;
+                }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+                    return lawsOpinionGatherNodeEnum.enName;
+                }
+            }
+        }
+        return null;
+    }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/OperatorRoleCodeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/OperatorRoleCodeEnum.java
new file mode 100644
index 000000000..50eda4aff
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/OperatorRoleCodeEnum.java
@@ -0,0 +1,64 @@
+package com.jero.modules.lawsOpinionGather.enums;
+
+import com.ydw.bat.wkflow.business_main.datas.constant.CutEnum;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 法规意见收集/法规技术评估流程使用
+ * 操作角色枚举类
+ */
+public enum OperatorRoleCodeEnum {
+
+    INITIATOR("发起人","Initiator","Initiator"),
+    EVALUATOR("评估人","Evaluator","Evaluator"),
+    ;
+
+
+    String cnName;
+    String enName;
+    String value;
+
+    private OperatorRoleCodeEnum(String cnName, String value, String enName) {
+        this.cnName = cnName;
+        this.value = value;
+        this.enName = enName;
+    }
+
+    public String getCnName() {
+        return cnName;
+    }
+
+    public void setCnName(String cnName) {
+        this.cnName = cnName;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public static String getTextByValue(String value,String cut) {
+        OperatorRoleCodeEnum[] values = values();
+        for (OperatorRoleCodeEnum operatorRoleCodeEnum : values) {
+            if (operatorRoleCodeEnum.value.equals(value)) {
+                if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+                    return operatorRoleCodeEnum.cnName;
+                }else if(StringUtils.equals(cut, CutEnum.EN.getValue())){
+                    return operatorRoleCodeEnum.enName;
+                }
+            }
+        }
+        return null;
+    }
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsProcessHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsProcessHistoryEOService.java
index 7d52e881e..50df84da2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsProcessHistoryEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsProcessHistoryEOService.java
@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.jero.common.api.vo.Result;
 import com.jero.modules.lawsOpinionGather.entity.LawsProcessHistoryEO;
 import com.baomidou.mybatisplus.extension.service.IService;
+
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -59,7 +61,9 @@ public interface ILawsProcessHistoryEOService extends IService<LawsProcessHistor
 	 *
 	 * @return
 	 */
-    List<LawsProcessHistoryEO> queryList();
+    List<LawsProcessHistoryEO> queryList(LawsProcessHistoryEO lawsProcessHistoryEO, HttpServletRequest req,String cut);
+
+    public void disposeData(List<LawsProcessHistoryEO> datas,String cut);
 
 	/**
 	 * 流程调用
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 77599194d..7c9c84aa2 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
@@ -2,13 +2,18 @@ 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.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.lawsOpinionGather.entity.LawsProcessHistoryEO;
+import com.jero.modules.lawsOpinionGather.enums.LawsOpinionGatherNodeEnum;
+import com.jero.modules.lawsOpinionGather.enums.OperatorRoleCodeEnum;
 import com.jero.modules.lawsOpinionGather.mapper.LawsProcessHistoryEOMapper;
 import com.jero.modules.lawsOpinionGather.service.ILawsProcessHistoryEOService;
 import com.jero.modules.project.enums.OperatorTypeEnum;
 import com.jero.modules.project.enums.RequestSourceEnum;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -17,6 +22,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
@@ -92,10 +99,27 @@ public class LawsProcessHistoryEOServiceImpl extends ServiceImpl<LawsProcessHist
 	 * @return
 	 */
 	@Override
-    public List<LawsProcessHistoryEO> queryList() {
-        return list();
+    public List<LawsProcessHistoryEO> queryList(LawsProcessHistoryEO lawsProcessHistoryEO, HttpServletRequest req,String cut) {
+		QueryWrapper<LawsProcessHistoryEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsProcessHistoryEO, req.getParameterMap());
+		List<LawsProcessHistoryEO> lawsProcessHistoryEOList = this.baseMapper.selectList(queryWrapper);
+		return lawsProcessHistoryEOList;
     }
 
+    @Override
+	public void disposeData(List<LawsProcessHistoryEO> datas, String cut){
+		if(CollectionUtils.isNotEmpty(datas)){
+			datas.forEach(data -> {
+				if(StringUtils.isNotEmpty(data.getOperatorRoleCode())){
+					data.setOperatorRoleName(OperatorRoleCodeEnum.getTextByValue(data.getOperatorRoleCode(),cut));
+				}
+
+				if(StringUtils.isNotEmpty(data.getTaskDefinitionKey())){
+					data.setTaskDefinitionKeyName(LawsOpinionGatherNodeEnum.getTextByValue(data.getTaskDefinitionKey(),cut));
+				}
+			});
+		}
+	}
+
 	@Override
 	public Result<?> processCall(JSONObject jsonObject) {
 		String requestSource = jsonObject.getString("requestSource");

From cccea320d0e159c66e7fd6b562ba0d886beea298 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 4 Jul 2022 18:03:10 +0800
Subject: [PATCH 25/31] =?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   | 25 +++++++++++++++----
 .../ParameterItemCollectionList.vue           |  6 ++++-
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index 40d2d66c3..177019a7e 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -29,7 +29,9 @@
                        :disabled="item.isLock == '1' ? true: false"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
                        event.returnValue="false"
-                       onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
+                       ondragenter="return false"
+                       onblur="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
+                       onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
@@ -38,6 +40,7 @@
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
                               :precision="0"
+                              :min="1"
                               :placeholder="$t('enterPositiveInteger')"
                               v-model="item.dataValue"/>
             </div>
@@ -182,8 +185,10 @@
                        :maxLength="1000"
                        event.returnValue="false"
                        :disabled="item.isLock == '1' ? true: false"
+                       ondragenter="return false"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
-                       onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
+                       onblur="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
+                       onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
@@ -191,6 +196,7 @@
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
+                              :min="1"
                               :precision="0"
                               :placeholder="$t('enterPositiveInteger')"
                               v-model="item.dataValue"/>
@@ -277,9 +283,11 @@
               <a-input class="box-input inputWid"
                        :maxLength="1000"
                        event.returnValue="false"
+                       ondragenter="return false"
+                       onblur="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
+                       onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
                        :disabled="item.isLock == '1' ? true: false"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
-                       onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
@@ -288,6 +296,7 @@
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
                               :precision="0"
+                              :min="1"
                               :placeholder="$t('enterPositiveInteger')"
                               v-model="item.dataValue"/>
             </div>
@@ -385,9 +394,11 @@
               <a-input class="box-input inputWid"
                        :maxLength="1000"
                        event.returnValue="false"
+                       ondragenter="return false"
                        :disabled="item.isLock == '1' ? true: false"
+                       onblur="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
-                       onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
+                       onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
@@ -396,6 +407,7 @@
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
                               :precision="0"
+                              :min="1"
                               :placeholder="$t('enterPositiveInteger')"
                               v-model="item.dataValue"/>
             </div>
@@ -549,8 +561,10 @@
                        :disabled="item.isLock == '1' ? true: false"
                        :maxLength="1000"
                        event.returnValue="false"
+                       ondragenter="return false"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
-                       onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
+                       onblur="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
+                       onkeyup="value=value.replace(/[^\u4E00-\u9FA5]/g,'')"
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
@@ -559,6 +573,7 @@
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
                               :precision="0"
+                              :min="1"
                               :placeholder="$t('enterPositiveInteger')"
                               v-model="item.dataValue"/>
             </div>
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 71c29c007..6006c8b5b 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -1154,7 +1154,11 @@
           if (num && num == 1) {
             this.textLoading = true
           }
-          postAction('/params/collectManifest/save', configDataList).then((res) => {
+          let query = {
+            ...configDataList,
+            paramsManifestId: this.paramsManifest.id
+          }
+          postAction('/params/collectManifest/save', query).then((res) => {
             if (res.success) {
               if (num && num == 1) {
                 _this.$message.success(_this.$t('OperationSuccessful'))

From 918ce8b8da32282f4296a8785729b715a8a37db3 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 5 Jul 2022 09:31:15 +0800
Subject: [PATCH 26/31] =?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

---
 .../lawsOpinionGather/enums/LawsOpinionGatherNodeEnum.java      | 1 +
 .../modules/lawsOpinionGather/enums/OperatorRoleCodeEnum.java   | 2 +-
 jero-web/src/common/lang/zh-cn.js                               | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/LawsOpinionGatherNodeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/LawsOpinionGatherNodeEnum.java
index 27c8a75c2..a4b2bc62f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/LawsOpinionGatherNodeEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/LawsOpinionGatherNodeEnum.java
@@ -1,6 +1,7 @@
 package com.jero.modules.lawsOpinionGather.enums;
 
 import com.alibaba.druid.util.StringUtils;
+import com.jero.common.constant.enums.CutEnum;
 
 /**
  * 法规意见收集 节点枚举类
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/OperatorRoleCodeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/OperatorRoleCodeEnum.java
index 50eda4aff..ae30be989 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/OperatorRoleCodeEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/OperatorRoleCodeEnum.java
@@ -1,6 +1,6 @@
 package com.jero.modules.lawsOpinionGather.enums;
 
-import com.ydw.bat.wkflow.business_main.datas.constant.CutEnum;
+import com.jero.common.constant.enums.CutEnum;
 import org.apache.commons.lang3.StringUtils;
 
 /**
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 3b9a2e3c0..e682a10f4 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -282,7 +282,7 @@ module.exports = {
   enterMenuTitle: '请输入菜单标题',
   enterAuthorizationPolicy: '请输入授权策略',
   AuthorizationIDExists: '授权标识已存在',
-  enterPositiveInteger: '请输入正整数',
+  enterPositiveInteger: '请输入整数',
   RuleName: '规则名称',
   enterRuleName: '请输入规则名称',
   RuleField: '规则字段',

From 03fa31f73e48c39b034062b4d44e99936e9efe6b Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 5 Jul 2022 09:32:19 +0800
Subject: [PATCH 27/31] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 48813b4fd..71ccbffc7 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
@@ -63,6 +63,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 

From 2701fbdd31bf5f023eccd89d28ed9b2018d62c38 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Tue, 5 Jul 2022 09:49:01 +0800
Subject: [PATCH 28/31] =?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-bug55428?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOController.java    |  6 ++--
 .../IParamsCollectManifestEOService.java      |  2 +-
 .../ParamsCollectManifestEOServiceImpl.java   | 34 +++++++++++++++++--
 ...msCollectManifestHistoryEOServiceImpl.java |  8 ++++-
 .../impl/ParamsReportDetailEOServiceImpl.java |  8 ++++-
 5 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
index 1b3a080a4..aed81c064 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
@@ -140,7 +140,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 	@ApiOperation(value="参数项收集清单-添加查询", notes="参数项收集清单-添加查询")
 	@GetMapping(value = "/paramsInfoList")
 //	@RequiresPermissions("params:collectManifest:add")
-	public Result<List<ParamsInfoPublishEO>> paramsInfoList(ParamsCollectManifestVO paramsCollectManifestVO,
+	public Result<List<Map<String, Object>>> paramsInfoList(ParamsCollectManifestVO paramsCollectManifestVO,
 															@RequestParam(name = "cut") String cut) {
 		if (StringUtils.isNotEmpty(paramsCollectManifestVO.getNioNumber())) {
 			paramsCollectManifestVO.setNioNumber(paramsCollectManifestVO.getNioNumber().replace("%","\\%"));
@@ -149,8 +149,8 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 			paramsCollectManifestVO.setParamsName(paramsCollectManifestVO.getParamsName().replace("%","\\%"));
 		}
 
-		List<ParamsInfoPublishEO> list = paramsCollectManifestEOService.getParamsInfoPublishListForAdd(paramsCollectManifestVO);
-		return Result.OK(cut, list);
+		List<Map<String, Object>> list = paramsCollectManifestEOService.getParamsInfoPublishListForAdd(paramsCollectManifestVO);
+		return Result.OK(list);
 	}
 
 	/**
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
index 977b46f42..fce085305 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
@@ -95,7 +95,7 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
 	 * @param paramsCollectManifestVO
 	 * @return
 	 */
-	List<ParamsInfoPublishEO> getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO);
+	List<Map<String, Object>> getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO);
 
 	List<Map<String,String>> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO);
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 71ccbffc7..91c88c0de 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
@@ -841,7 +841,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 	 * @return
 	 */
 	@Override
-	public List<ParamsInfoPublishEO> getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO) {
+	public List<Map<String, Object>> getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO) {
+		String cut = paramsCollectManifestVO.getCut();
+
 		LambdaQueryWrapper<ParamsInfoPublishEO> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.eq(ParamsInfoPublishEO::getParamsTemplateId, paramsCollectManifestVO.getParamsTemplateId())
 				.eq(ParamsInfoPublishEO::getVersion, paramsCollectManifestVO.getParamsTemplatePublishVersion())
@@ -859,7 +861,27 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		List<String> nioNumberList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList());
 		paramsInfoPublishEOList = paramsInfoPublishEOList.stream().filter(e-> !nioNumberList.contains(e.getNioNumber())).collect(Collectors.toList());
 
-		return paramsInfoPublishEOList;
+		// 查询 责任领域 数据字典
+		List<SysDictItem> dictItems = sysDictItemService.selectItemsByDictCode("duty_territory");
+		Map<String, String> dictItemsMap = new HashMap<>();
+		if (CutEnum.EN.getValue().equals(cut)) {
+			dictItemsMap = dictItems.stream().collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName));
+		} else {
+			dictItemsMap = dictItems.stream().collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getItemText));
+		}
+
+		// 处理数据 返回map ---> 解决数据量大,系统拦截器转换数据字典慢的问题
+		List<Map<String, Object>> listMapForAdd = new ArrayList<>();
+		Map<String, String> finalDictItemsMap = dictItemsMap;
+		paramsInfoPublishEOList.forEach(paramsInfoPublishEO -> {
+			Map<String, Object> paramsInfoPublishMap = objectToMap(paramsInfoPublishEO);
+			// 处理责任领域数据字典
+			paramsInfoPublishMap.put("dutyTerritory_dictText", finalDictItemsMap.get(paramsInfoPublishEO.getDutyTerritory()));
+
+			listMapForAdd.add(paramsInfoPublishMap);
+		});
+
+		return listMapForAdd;
 	}
 
 	@Override
@@ -1664,7 +1686,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				if (o != null) {
 					if (Date.class.equals(field.getType())) {
 						Date date = (Date) o;
-						SimpleDateFormat formatter=new SimpleDateFormat("yyyy-MM-dd");
+						String pattern = "";
+						if ("deadline".equals(varName)) {
+							pattern = "yyyy-MM-dd";
+						} else {
+							pattern = "yyyy-MM-dd HH:mm:ss";
+						}
+						SimpleDateFormat formatter=new SimpleDateFormat(pattern);
 						String time=formatter.format(date);
 						map.put(varName, time);
 					} else {
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
index 6751543e1..cc8457f40 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
@@ -501,7 +501,13 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
 				if (o != null) {
 					if (Date.class.equals(field.getType())) {
 						Date date = (Date) o;
-						SimpleDateFormat formatter=new SimpleDateFormat("yyyy-MM-dd");
+						String pattern = "";
+						if ("deadline".equals(varName)) {
+							pattern = "yyyy-MM-dd";
+						} else {
+							pattern = "yyyy-MM-dd HH:mm:ss";
+						}
+						SimpleDateFormat formatter=new SimpleDateFormat(pattern);
 						String time=formatter.format(date);
 						map.put(varName, time);
 					} else {
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 5a763aa38..f31c090aa 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
@@ -909,7 +909,13 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 				if (o != null) {
 					if (Date.class.equals(field.getType())) {
 						Date date = (Date) o;
-						SimpleDateFormat formatter=new SimpleDateFormat("yyyy-MM-dd");
+						String pattern = "";
+						if ("deadline".equals(varName)) {
+							pattern = "yyyy-MM-dd";
+						} else {
+							pattern = "yyyy-MM-dd HH:mm:ss";
+						}
+						SimpleDateFormat formatter=new SimpleDateFormat(pattern);
 						String time=formatter.format(date);
 						map.put(varName, time);
 					} else {

From 5c61f76e6284afb1cb935efa352ebdda2c9d3b22 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 5 Jul 2022 14:35:43 +0800
Subject: [PATCH 29/31] =?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

---
 jero-web/src/common/lang/en-us.js                | 2 +-
 jero-web/src/common/lang/zh-cn.js                | 2 +-
 jero-web/src/components/CollectionType/index.vue | 5 -----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 2bf1259d2..6d0455929 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1064,7 +1064,7 @@ module.exports = {
   Ftext: 'Text+Pull single+File',
   Nnothing: 'Null',
   Nchinese: 'Chinese',
-  NpositiveInteger: 'Positive integer',
+  NpositiveInteger: 'Integer',
   NPositivefloatingpointnumber: 'Positive float',
   NintegerOrDecimal: 'Integer decimal',
   NOneDecimalPlace: 'Decimal one',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index e682a10f4..ed23534e4 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1073,7 +1073,7 @@ module.exports = {
   Ftext: '文本+下拉单选+附件',
   Nnothing: '无',
   Nchinese: '中文',
-  NpositiveInteger: '正整数',
+  NpositiveInteger: '整数',
   NPositivefloatingpointnumber: '正浮点数',
   NintegerOrDecimal: '整数或小数',
   NOneDecimalPlace: '一位小数',
diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index 177019a7e..efc3a9f0d 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -40,7 +40,6 @@
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
                               :precision="0"
-                              :min="1"
                               :placeholder="$t('enterPositiveInteger')"
                               v-model="item.dataValue"/>
             </div>
@@ -196,7 +195,6 @@
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
-                              :min="1"
                               :precision="0"
                               :placeholder="$t('enterPositiveInteger')"
                               v-model="item.dataValue"/>
@@ -296,7 +294,6 @@
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
                               :precision="0"
-                              :min="1"
                               :placeholder="$t('enterPositiveInteger')"
                               v-model="item.dataValue"/>
             </div>
@@ -407,7 +404,6 @@
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
                               :precision="0"
-                              :min="1"
                               :placeholder="$t('enterPositiveInteger')"
                               v-model="item.dataValue"/>
             </div>
@@ -573,7 +569,6 @@
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
                               :precision="0"
-                              :min="1"
                               :placeholder="$t('enterPositiveInteger')"
                               v-model="item.dataValue"/>
             </div>

From 345ca85963f198b136ae808f43c37868833aa720 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 5 Jul 2022 14:41:39 +0800
Subject: [PATCH 30/31] =?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

---
 jero-web/src/components/ParameterLibraryAdd/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jero-web/src/components/ParameterLibraryAdd/index.vue b/jero-web/src/components/ParameterLibraryAdd/index.vue
index f77f108c5..f64e2d323 100644
--- a/jero-web/src/components/ParameterLibraryAdd/index.vue
+++ b/jero-web/src/components/ParameterLibraryAdd/index.vue
@@ -98,7 +98,7 @@
       :dataSource='areaTable'
       :pagination='false'
       :loading='loading'
-      :scroll='{x: 600}'
+      :scroll='{x: 760,y:400}'
       :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
       @change='handleTableChange'>
       <a slot='name' slot-scope='text'>{{ text }}</a>
@@ -133,18 +133,21 @@ export default {
           title: this.$t('NiONumber'),
           dataIndex: 'nioNumber',
           align: 'center',
+          width:200,
           ellipsis: true
         },
         {
           title: this.$t('ParameterName'),
           align: 'center',
           dataIndex: 'paramsName',
+          width:200,
           ellipsis: true
         },
         {
           title: this.$t('areaOfResponsibility'),
           dataIndex: 'dutyTerritory_dictText',
           align: 'center',
+          width:200,
           ellipsis: true
         }
       ],

From 89424f793fe2fe77cc64863c86fc68077b732d40 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Tue, 5 Jul 2022 14:43:37 +0800
Subject: [PATCH 31/31] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9-=E6=8E=A7=E4=BB=B6=E6=A0=A1=E9=AA=8C=20=E6=AD=A3?=
 =?UTF-8?q?=E6=95=B4=E6=95=B0=E6=94=B9=E6=95=B4=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/modules/cert/template/entity/ParamsInfoEO.java     | 2 +-
 .../com/jero/modules/cert/template/enums/ControlVerifyEnum.java | 2 +-
 .../com/jero/modules/cert/template/vo/ParamsInfoEnExport.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java
index cdca194aa..bac0f3502 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java
@@ -111,7 +111,7 @@ public class ParamsInfoEO implements Serializable {
     private String controlType;
 
 	/**控件校验*/
-    @Excel(name = "控件校验", width = 15, replace = {"无_1","中文_2","正整数_3","正浮点数_4","整数或小数_5","一位小数_6","两位小数_7","三位小数_8","四位小数_9"})
+    @Excel(name = "控件校验", width = 15, replace = {"无_1","中文_2","整数_3","正浮点数_4","整数或小数_5","一位小数_6","两位小数_7","三位小数_8","四位小数_9"})
     @ApiModelProperty(value = "控件校验")
     private String controlVerify;
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java
index b8b399e51..8bb6ccc20 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java
@@ -13,7 +13,7 @@ import java.util.Map;
 public enum ControlVerifyEnum {
     NULL("无","Null","1"),
     CHINESE("中文","Chinese","2"),
-    POSITIVE_INTEGER("正整数","Positive integer","3"),
+    POSITIVE_INTEGER("整数","Integer","3"),
     POSITIVE_FLOAT("正浮点数","Positive float","4"),
     INTEGER_DECIMAL("整数或小数","Integer decimal","5"),
     DECIMAL_ONE("一位小数","Decimal one","6"),
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java
index e4e9b0339..6a9163656 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java
@@ -94,7 +94,7 @@ public class ParamsInfoEnExport {
     private String controlType;
 
     /**控件校验*/
-    @Excel(name = "Control Verify", width = 15, replace = {"Null_1","Chinese_2","Positive integer_3","Positive float_4","Integer decimal_5","Decimal one_6","Decimal two_7","Decimal three_8","Decimal four_9"})
+    @Excel(name = "Control Verify", width = 15, replace = {"Null_1","Chinese_2","Integer_3","Positive float_4","Integer decimal_5","Decimal one_6","Decimal two_7","Decimal three_8","Decimal four_9"})
     @ApiModelProperty(value = "控件校验")
     private String controlVerify;