From b062aeb75116e163f15bb4a9f3abff8b5187aa9d Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 5 Sep 2022 11:22:20 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A8=A1=E6=9D=BF,=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=A1=AB=E5=86=99--=E5=BB=BA=E8=A1=A8SQL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index a5292221a..516796223 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -94,6 +94,58 @@ ALTER TABLE `laws_weilai`.`params_report`
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
+-- 法规月报标题模板(生成环境未同步)
+CREATE TABLE `laws_monthly_report_title_template`  (
+  `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建日期',
+  `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新日期',
+  `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+  `parent_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '父id',
+  `title_cn` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '中文标题',
+  `title_en` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '英文标题',
+  `sort` int(10) NULL DEFAULT NULL COMMENT '排序',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+-- 法规月报填写(生成环境未同步)
+CREATE TABLE `laws_monthly_report_write`  (
+  `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建日期',
+  `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新日期',
+  `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+  `month` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '月份',
+  `memories_chapter` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '章节目录',
+  `content_template` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '内容模板',
+  `title_cn` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '中文标题',
+  `title_en` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '英文标题',
+  `technology_territory` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关领域',
+  `apply_car` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '适用车型',
+  `apply_scope` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '适用范围',
+  `state` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态',
+  `use_method` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用法',
+  `implement_car` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '实施车型',
+  `issue_time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布日期',
+  `new_car_implement_time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '新车型实施日期',
+  `production_car_implement_time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '在产车实施日期',
+  `content_cn` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '主要内容中文',
+  `content_en` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '主要内容英文',
+  `work_progress_cn` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'NIO工作进展中文',
+  `work_progress_en` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'NIO工作进展英文',
+  `laws_contact` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规联系人',
+  `link` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '链接',
+  `export_state` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '导出状态',
+  `related_areas_cn` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关领域中文',
+  `related_areas_en` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关领域英文',
+  `source_cn` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源中文',
+  `time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期',
+  `source_en` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源英文',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
 -- 参数清单表 修改字段长度
 ALTER TABLE `laws_weilai`.`params_manifest`
     MODIFY COLUMN `title` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题' AFTER `sys_org_code`;

From c595afddf68da8a764ac4510cb2291be3b891855 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 5 Sep 2022 14:04:16 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?=
 =?UTF-8?q?=E6=96=B0=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E8=A1=A8sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 516796223..5a528b8e5 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -146,6 +146,22 @@ CREATE TABLE `laws_monthly_report_write`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
+-- 法规月报新征求意见模板表(生成环境未同步)
+CREATE TABLE `new_opinion_template`  (
+  `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建日期',
+  `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新日期',
+  `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+  `laws_monthly_report_write_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '月报填写表id',
+  `plan_number_cn` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '计划号中文',
+  `standard_name_cn` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准名称中文',
+  `standard_name_en` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准名称英文',
+  `expiration_date` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '征求意见截止日期',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
 -- 参数清单表 修改字段长度
 ALTER TABLE `laws_weilai`.`params_manifest`
     MODIFY COLUMN `title` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题' AFTER `sys_org_code`;

From 812fb421490fb444b7a449d651d7d40939601a43 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 5 Sep 2022 14:19:33 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?=
 =?UTF-8?q?=E6=96=B0=E5=8F=91=E5=B8=83=E6=A0=87=E5=87=86=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E8=A1=A8sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 5a528b8e5..295717364 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -162,6 +162,23 @@ CREATE TABLE `new_opinion_template`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
+-- 法规月报新发布标准模板表(生成环境未同步)
+CREATE TABLE `new_standard_template`  (
+  `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建日期',
+  `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新日期',
+  `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
+  `laws_monthly_report_write_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '月报填写表id',
+  `standard_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准编号',
+  `standard_name_cn` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准名称中文',
+  `standard_name_en` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准名称英文',
+  `issue_time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布日期',
+  `implement_time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '实施日期',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
 -- 参数清单表 修改字段长度
 ALTER TABLE `laws_weilai`.`params_manifest`
     MODIFY COLUMN `title` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题' AFTER `sys_org_code`;

From 14ab36a5ed6ff23dafcb9850eaf45dee5714b454 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 5 Sep 2022 14:28:53 +0800
Subject: [PATCH 4/7] =?UTF-8?q?SQL=E5=90=8C=E6=AD=A5=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 295717364..69fe0390a 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -79,7 +79,7 @@ ALTER TABLE `laws_weilai`.`params_report_config_data`
 ALTER TABLE `laws_weilai`.`params_report`
     ADD COLUMN `params_template_publish_version` int(11) NULL DEFAULT NULL COMMENT '对应参数模板发布版本' AFTER `old_params_manifest_id`;
 
--- 法规月报管理表
+-- 法规月报管理表(生成环境已同步)
     CREATE TABLE `laws_monthly_report_manage`  (
   `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
   `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
@@ -94,7 +94,7 @@ ALTER TABLE `laws_weilai`.`params_report`
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
--- 法规月报标题模板(生成环境未同步)
+-- 法规月报标题模板(生成环境已同步)
 CREATE TABLE `laws_monthly_report_title_template`  (
   `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
   `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
@@ -109,7 +109,7 @@ CREATE TABLE `laws_monthly_report_title_template`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
--- 法规月报填写(生成环境未同步)
+-- 法规月报填写(生成环境已同步)
 CREATE TABLE `laws_monthly_report_write`  (
   `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
   `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
@@ -146,7 +146,7 @@ CREATE TABLE `laws_monthly_report_write`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
--- 法规月报新征求意见模板表(生成环境未同步)
+-- 法规月报新征求意见模板表(生成环境已同步)
 CREATE TABLE `new_opinion_template`  (
   `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
   `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
@@ -162,7 +162,7 @@ CREATE TABLE `new_opinion_template`  (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
--- 法规月报新发布标准模板表(生成环境未同步)
+-- 法规月报新发布标准模板表(生成环境已同步)
 CREATE TABLE `new_standard_template`  (
   `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
   `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',

From aa04cf9cec6057e88e0e502807865c1e72592ab6 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 5 Sep 2022 16:31:09 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/entity/LawsMonthlyReportTitleTemplateEO.java       | 3 +++
 .../impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java     | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java
index 7b9888886..4a66c3f86 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java
@@ -81,4 +81,7 @@ public class LawsMonthlyReportTitleTemplateEO implements Serializable {
 
     //排序
     private int sort;
+
+    @TableField(exist = false)
+    private String key;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java
index 20950cba4..8852e0412 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java
@@ -220,6 +220,10 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl<Law
 	public List<LawsMonthlyReportTitleTemplateEO> getPageInfo(LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEOTemp, HttpServletRequest req) {
 		QueryWrapper<LawsMonthlyReportTitleTemplateEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportTitleTemplateEOTemp, req.getParameterMap());
 		List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS = this.list(queryWrapper);
+		for (LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO : lawsMonthlyReportTitleTemplateEOS) {
+			//前端需要的特殊数据格式
+			lawsMonthlyReportTitleTemplateEO.setKey(lawsMonthlyReportTitleTemplateEO.getId());
+		}
 		List<LawsMonthlyReportTitleTemplateEO> parentList = lawsMonthlyReportTitleTemplateEOS.stream()
 				.filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList());
 		Collections.sort(parentList, new Comparator<LawsMonthlyReportTitleTemplateEO>() {

From 0fb59689e973d21b58ac7a9b9f49524861955245 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com>
Date: Mon, 5 Sep 2022 18:04:06 +0800
Subject: [PATCH 6/7] =?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/virtualListDetails.vue         | 54 +++++++++++
 .../processForm/processDetails/index.vue      |  2 +-
 .../components/listOfRegulations.vue          | 91 +++++++++++++++++--
 3 files changed, 138 insertions(+), 9 deletions(-)

diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index 31e0b904d..e647e1e68 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -725,6 +725,29 @@
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
             this.dataSource = res.result || []
+            if (this.dataSource.length == 0) {
+              this.$nextTick(() => {
+                let anttablebody = document.getElementsByClassName('ant-table-body')
+                let antfixedLeft = document.querySelectorAll('.ant-table-fixed-left .ant-table-body-inner')
+                let antfixedRight = document.querySelectorAll('.ant-table-fixed-right .ant-table-body-inner')
+                anttablebody[0].classList.add('ant-table-body-one')
+                antfixedLeft[0].classList.add('antfixedLeft')
+                antfixedRight[0].classList.add('antfixedRight')
+              })
+            } else {
+              let anttablebody = document.getElementsByClassName('ant-table-body-one')
+              let antfixedLeft = document.getElementsByClassName('antfixedLeft')
+              let antfixedRight = document.getElementsByClassName('antfixedRight')
+              if (anttablebody && anttablebody.length > 0) {
+                anttablebody[0].classList.remove('ant-table-body-one')
+              }
+              if (antfixedLeft && antfixedLeft.length > 0) {
+                antfixedLeft[0].classList.remove('antfixedLeft')
+              }
+              if (antfixedRight && antfixedRight.length > 0) {
+                antfixedRight[0].classList.remove('antfixedRight')
+              }
+            }
             this.loading = false
           } else {
             this.loading = false
@@ -1030,6 +1053,37 @@
   ::v-deep .ant-table-body {
     background: transparent!important;
   }
+
+  ::v-deep .ant-table-fixed-header .ant-table-body-inner {
+    overflow: visible;
+  }
+
+  ::v-deep .ant-table-body {
+    padding-bottom: 7px;
+  }
+
+  ::v-deep .ant-table-body-inner {
+    padding-bottom: 16px;
+  }
+
+  ::v-deep .ant-table-scroll .ant-table-header::-webkit-scrollbar {
+    /*height: 0;*/
+    width: 0;
+  }
+
+  ::v-deep .ant-table-body-one {
+    padding-bottom: 0!important;
+  }
+
+  ::v-deep .antfixedLeft {
+    padding-bottom: 0!important;
+    overflow: scroll!important;
+  }
+
+  ::v-deep .antfixedRight {
+    padding-bottom: 0!important;
+    overflow: scroll!important;
+  }
 </style>
 <style>
   .box-input .ant-select-selection {
diff --git a/jero-web/src/views/processCenter/processForm/processDetails/index.vue b/jero-web/src/views/processCenter/processForm/processDetails/index.vue
index 5c3d172af..3f204eb2e 100644
--- a/jero-web/src/views/processCenter/processForm/processDetails/index.vue
+++ b/jero-web/src/views/processCenter/processForm/processDetails/index.vue
@@ -7,7 +7,7 @@
         </div>
         <!--        <span class="flow-chart-title">{{ $route.params.processNumber }}  {{ $route.params.processTypeName }}  流程图</span>-->
       </div>
-      <div class="flow-group" style="margin-top: 30px;overflow: auto;">
+      <div class="flow-group" style="margin-top: 30px;overflow: auto;text-align: center">
         <img :src="processStep" class="process-img">
       </div>
     </div>
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 4a01f7b1e..08715202a 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1507,9 +1507,32 @@
         getAction(this.url.list, query).then((res) => {
           this.getRoleByUserId()
           if (res.success) {
-            this.dataSource = res.result
+            this.dataSource = res.result || []
             this.loading = false
             this.JLoading = false
+            if (this.dataSource.length == 0) {
+              this.$nextTick(() => {
+                let anttablebody = document.getElementsByClassName('ant-table-body')
+                let antfixedLeft = document.querySelectorAll('.ant-table-fixed-left .ant-table-body-inner')
+                let antfixedRight = document.querySelectorAll('.ant-table-fixed-right .ant-table-body-inner')
+                anttablebody[0].classList.add('ant-table-body-one')
+                antfixedLeft[0].classList.add('antfixedLeft')
+                antfixedRight[0].classList.add('antfixedRight')
+              })
+            } else {
+              let anttablebody = document.getElementsByClassName('ant-table-body-one')
+              let antfixedLeft = document.getElementsByClassName('antfixedLeft')
+              let antfixedRight = document.getElementsByClassName('antfixedRight')
+              if (anttablebody && anttablebody.length > 0) {
+                anttablebody[0].classList.remove('ant-table-body-one')
+              }
+              if (antfixedLeft && antfixedLeft.length > 0) {
+                antfixedLeft[0].classList.remove('antfixedLeft')
+              }
+              if (antfixedRight && antfixedRight.length > 0) {
+                antfixedRight[0].classList.remove('antfixedRight')
+              }
+            }
           } else {
             this.JLoading = false
             this.loading = false
@@ -2052,7 +2075,7 @@
               commentContent: this.$t('For') + content.join(',') + this.$t('markedRejection') + '：' + this.formInlineComment.commentContent,
               projectLibraryId: this.$route.query.id
             }
-            this.rejectCauseAdd(this.formInlineComment.commentContent,ids)
+            this.rejectCauseAdd(this.formInlineComment.commentContent, ids)
             this.confirmLoadingComment = true
             let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
             this.updateStatusBatch(1, selectedRowKeys)
@@ -2067,14 +2090,14 @@
           }
         })
       },
-      rejectCauseAdd(rejectCause,ids) {
+      rejectCauseAdd(rejectCause, ids) {
         let rejectTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
         let query = {
-          rejectUserId:this.userInfo().id,
-          rejectTime:rejectTime,
-          rejectCause:rejectCause,
-          projectLawsInventoryId:ids.join(','),
-          rejectType:'0',
+          rejectUserId: this.userInfo().id,
+          rejectTime: rejectTime,
+          rejectCause: rejectCause,
+          projectLawsInventoryId: ids.join(','),
+          rejectType: '0'
         }
         postAction('/project/projectLawsInventoryRejectCauseEO/add', query).then((res) => {
 
@@ -2413,6 +2436,58 @@
   ::v-deep .ant-table-body {
     background: transparent !important;
   }
+
+  ::v-deep .ant-table-body::-webkit-scrollbar {
+    z-index: 10000000;
+  }
+
+  /*::v-deep .ant-table .ant-table-fixed-left {*/
+  /*  height: auto !important;*/
+  /*  bottom: 8px !important;*/
+  /*}*/
+
+  /*::v-deep .ant-table .ant-table-fixed-right {*/
+  /*  height: auto !important;*/
+  /*  bottom: 8px !important;*/
+  /*}*/
+
+  ::v-deep .ant-table-fixed-header .ant-table-body-inner {
+    overflow: visible;
+  }
+
+  /*::v-deep .ant-table-fixed-left .ant-table-body-inner {*/
+  /*  overflow-y: scroll;*/
+  /*}*/
+
+  /*::v-deep .ant-table-fixed-right .ant-table-body-inner {*/
+  /*  overflow-y: scroll;*/
+  /*}*/
+  ::v-deep .ant-table-body {
+    padding-bottom: 7px;
+  }
+
+  ::v-deep .ant-table-body-inner {
+    padding-bottom: 16px;
+  }
+
+  ::v-deep .ant-table-scroll .ant-table-header::-webkit-scrollbar {
+    /*height: 0;*/
+    width: 0;
+  }
+
+  ::v-deep .ant-table-body-one {
+    padding-bottom: 0!important;
+  }
+
+  ::v-deep .antfixedLeft {
+    padding-bottom: 0!important;
+    overflow: scroll!important;
+  }
+
+  ::v-deep .antfixedRight {
+    padding-bottom: 0!important;
+    overflow: scroll!important;
+  }
 </style>
 <style>
   .box-input .ant-select-selection {

From a2d3122bb448217767d15df28c18e6c238b87ccd Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 5 Sep 2022 18:05:36 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95-?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=E3=80=82?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=A6=85=E9=81=9359183=E3=80=82=20=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93-=E8=AF=A6=E6=83=85=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BD=93=E5=89=8D=E7=8A=B6=E6=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=2059223=20-=20=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=EF=BC=8C=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...LawsTechnologyEvaluationEOServiceImpl.java |  3 ++
 .../ProblemKnowledgeBaseEOServiceImpl.java    |  2 +-
 .../ProjectLawsInventoryEOServiceImpl.java    | 40 +++++++++++++++++++
 .../impl/ProjectLibraryBaseServiceImpl.java   |  4 +-
 .../ProjectTaskInventoryEOServiceImpl.java    | 17 +++++---
 .../wkflow/controller/workFlowController.java |  6 +--
 6 files changed, 61 insertions(+), 11 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
index f3a16a003..f1fdd8e75 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
@@ -446,6 +446,9 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 						/*String itemNum = row.getCell(0, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
 						String itemName = row.getCell(1, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
 						String itemContents = row.getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();*/
+						if(StringUtils.isEmpty(itemNum) && StringUtils.isEmpty(itemName) && StringUtils.isEmpty(itemContents)){
+							continue;
+						}
 
 						Map<String,Object> itemInfoMap = new HashMap<>();
 						String itemId = UUID.randomUUID().toString().replace("-", "");
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
index b7460d4c9..3a7397a15 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
@@ -806,7 +806,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 
 		//XXX向您推送了XXXXXXXXXX，请注意查看。
 		String msgContentEN = currentUser.getUsername()+" pushed " + problemKnowledgeBaseTitle + " to you.Please be reminded to check it out.";
-		String msgTitle = problemKnowledgeBaseTitle + " has been shared with you, please check.";
+		String msgTitle = "A problem knowledge base has been shared with you, please check";
 
 		//飞书跳转链接
 		String hrefFeishu = backUrl + JumpLinkEnum.PROBLEM_KNOWLEDGE_BASE_DETAIL.getLink() + "?id=" + problemKnowledgeBaseId;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index be5eae4d4..e9fb0a37d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -391,6 +391,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		if(CollectionUtils.isNotEmpty(projectTaskInventoryEOList)){
 			//项目任务清单数据初始化。
 			this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
+			projectTaskInventoryEOList.forEach(taskInventory -> {
+				this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId());
+			});
 		}
 	}
 
@@ -593,6 +596,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 		removeById(id);
 		this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(Arrays.asList(id.split(",")));
+
+		QueryWrapper<ConditionAssessmentEO> removeWrapper = new QueryWrapper<>();
+		removeWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,id);
+		this.conditionAssessmentEOService.remove(removeWrapper);
 	}
 
 	/**
@@ -627,6 +634,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 		removeByIds(ids);
 		this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(ids);
+
+		QueryWrapper<ConditionAssessmentEO> removeWrapper = new QueryWrapper<>();
+		removeWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId,ids);
+		this.conditionAssessmentEOService.remove(removeWrapper);
 	}
 
 	/**
@@ -2620,6 +2631,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 //			projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
 //			projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
 			this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
+			projectTaskInventoryEOList.forEach(taskInventory -> {
+				this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId());
+			});
 		}
 
 	}
@@ -4472,6 +4486,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(idList);
 			this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
 
+			//初始化项目状态评估
+			projectTaskInventoryEOList.forEach(taskInventory -> {
+				this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId());
+			});
+
 			//删除该法规的任务明细数据
 			QueryWrapper<ProjectTaskInventoryDetailEO> deleteTaskInventoryDetailWrapper = new QueryWrapper<>();
 			deleteTaskInventoryDetailWrapper.lambda().in(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId,idList);
@@ -4834,6 +4853,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					projectTaskInventoryEOList.add(projectTaskInventoryEO);
 				}
 				this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
+				//初始化项目状态评估
+				projectTaskInventoryEOList.forEach(taskInventory -> {
+					this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId());
+				});
 
 				//更新log
 				String serialNumber = dataList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(","));
@@ -7314,4 +7337,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		}
 		return resultUserId;
 	}
+
+	/**
+	 * 初始化 法规清单对应的 项目状态评估表
+	 * @param projectLawsInventoryId
+	 */
+	public void initConditionAssessmentEO(String projectLawsInventoryId){
+
+		QueryWrapper<ConditionAssessmentEO> removeWrapper = new QueryWrapper<>();
+		removeWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,projectLawsInventoryId);
+		this.conditionAssessmentEOService.remove(removeWrapper);
+
+		ConditionAssessmentEO conditionAssessmentEO = new ConditionAssessmentEO();
+		conditionAssessmentEO.setRoleCode(ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue());
+		conditionAssessmentEO.setProjectLawsInventoryId(projectLawsInventoryId);
+		conditionAssessmentEO.setConditionAssessment(CurrentProjectStatusEnum.BLUE.getValue());
+		this.conditionAssessmentEOService.addOrUpdate(conditionAssessmentEO);
+	}
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 9cbae09de..688d9e05b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -449,8 +449,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 
 		QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrapper = new QueryWrapper<>();
 		lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,id);
-		lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getInventoryAffirmStatus, InventoryAffirmStatusEnum.ACCEPTED.getValue());
-		lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getTaskAffirmStatus, TaskAffirmStatusEnum.ACCEPTED.getValue());
+		//lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getInventoryAffirmStatus, InventoryAffirmStatusEnum.ACCEPTED.getValue());
+		//lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getTaskAffirmStatus, TaskAffirmStatusEnum.ACCEPTED.getValue());
 		List<ProjectLawsInventoryEO> projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper);
 		if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
 			List<String> projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
index ba96e021c..062a0d5f1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
@@ -179,8 +179,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 		QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO,req.getParameterMap());
 		//QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrapper = new QueryWrapper<>();
 		lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
-		lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getInventoryAffirmStatus, InventoryAffirmStatusEnum.ACCEPTED.getValue());
-		lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getTaskAffirmStatus, TaskAffirmStatusEnum.ACCEPTED.getValue());
+		//lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getInventoryAffirmStatus, InventoryAffirmStatusEnum.ACCEPTED.getValue());
+		//lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getTaskAffirmStatus, TaskAffirmStatusEnum.ACCEPTED.getValue());
 
 		String dutyTerritoryStr = "";
 		if (StringUtils.isNotEmpty(projectTaskInventoryEO.getDutyTerritory())) {
@@ -224,7 +224,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			taskDetailQueryWrapper.lambda().in(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId,projectLawsInventoryIdList);
 			List<ProjectTaskInventoryDetailEO> projectTaskInventoryDetailEOList = this.projectTaskInventoryDetailEOMapper.selectList(taskDetailQueryWrapper);
 
-			if(CollectionUtils.isNotEmpty(projectTaskInventoryEOList) && CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOList)){
+			//if(CollectionUtils.isNotEmpty(projectTaskInventoryEOList) && CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOList)){
+			if(CollectionUtils.isNotEmpty(projectTaskInventoryEOList)){
 				projectLawsInventoryEOList.forEach(projectLawsInventory -> {
 					projectTaskInventoryEOList.forEach(projectTaskInventory -> {
 						if(StringUtils.equals(projectLawsInventory.getId(),projectTaskInventory.getProjectLawsInventoryId())){
@@ -575,7 +576,13 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 		//2022-08-24 判断当前登录用户是否是系统管理员 或 R&H Manager角色，如果是的话，看到的数据与studio一致。
 		List<SysUserRole> userRoleList = this.sysUserRoleService.list(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, currentUser.getId())); // 查询用户所有角色
 		if(CollectionUtils.isNotEmpty(userRoleList)){
-			List<String> roleIdList = CollectManifestRoleIdEnum.getIdList();
+			List<String> roleIdList = new ArrayList<>();
+
+			String adminRoleId = CollectManifestRoleIdEnum.ADMIN_ID.getId();
+			String managerRoleId = CollectManifestRoleIdEnum.MANAGER_ID.getId();
+			roleIdList.add(adminRoleId);
+			roleIdList.add(managerRoleId);
+
 			List<SysUserRole> userRoles = userRoleList.stream().filter(userRole -> {
 				boolean flag = false;
 				for (String roleId : roleIdList) {
@@ -803,7 +810,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			}
 
 			/*if(StringUtils.isNotEmpty(actiProcInstId) && (isRegulationOwner || isHomologationEngineer || isStudio)){*/
-			if(StringUtils.isNotEmpty(actiProcInstId) && (isStudio || (showVerify || showDesign || showPrehomo))){
+			if(((isRegulationOwner || isHomologationEngineer || isStudio) || (showVerify || showDesign || showPrehomo))){
 				projectTaskInventoryEO.setShowFlag(TaskStatusEnum.SHOW_FLAG.getValue());
 			}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java
index a8b8f4fa9..8d1c4b8fd 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java
@@ -60,15 +60,15 @@ public class workFlowController {
             return this.startTaskToConfirmProcess(jsonObject);
         }else if(StringUtils.equals(type,FlowTypeEnum.SJFHXSHLC.getValue())){
             jsonObject.put("id", FlowTypeEnum.SJFHXSHLC.getProcessDefinitionKey());
-            initConditionAssessmentEO(jsonObject);
+            //initConditionAssessmentEO(jsonObject);
             return this.activiti_define_start(jsonObject);
         }else if(StringUtils.equals(type,FlowTypeEnum.PREHOMOQRLC.getValue())){
             jsonObject.put("id", FlowTypeEnum.PREHOMOQRLC.getProcessDefinitionKey());
-            initConditionAssessmentEO(jsonObject);
+            //initConditionAssessmentEO(jsonObject);
             return this.activiti_define_start(jsonObject);
         }else if(StringUtils.equals(type,FlowTypeEnum.YZFHXSCLC.getValue())){
             jsonObject.put("id", FlowTypeEnum.YZFHXSCLC.getProcessDefinitionKey());
-            initConditionAssessmentEO(jsonObject);
+            //initConditionAssessmentEO(jsonObject);
             return this.activiti_define_start(jsonObject);
         }else if(StringUtils.equals(type,FlowTypeEnum.FGYJSJLC.getValue())){
             jsonObject.put("id", FlowTypeEnum.FGYJSJLC.getProcessDefinitionKey());