From ae30f93f8a0abbebb08c83130b917ccbb237a125 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 27 Sep 2022 14:09:43 +0800 Subject: [PATCH] =?UTF-8?q?59978=20=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E6=B5=81=E7=A8=8B=EF=BC=8C=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=B7=BB=E5=8A=A0=E3=80=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E3=80=81=E5=AF=BC=E5=87=BA=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=9D=A1?= =?UTF-8?q?=E6=AC=BE=E5=86=85=E5=AE=B9=E5=AD=97=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 4 ++++ .../entity/LawsOpinionAssessmentResultEO.java | 5 +++++ ...awsOpinionAssessmentResultEOServiceImpl.java | 17 +++++++++-------- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 42b019d1b..d1b42bb96 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1163,3 +1163,7 @@ MODIFY COLUMN `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_gener -- 月报填写表 新增一级目录字段2022-09-25 未同步生产环境 ALTER TABLE `laws_weilai`.`laws_monthly_report_write` ADD COLUMN `memories_chapter_one` varchar(255) NULL COMMENT '章节目录对应的一级标题' AFTER `source_en`; + +-- 法规意见收集-评估结果表 增加字段 条款内容 2022-09-27 未同步生产环境 +ALTER TABLE `laws_weilai`.`laws_opinion_assessment_result` + ADD COLUMN `clause_content` varchar(600) NULL COMMENT '条款内容' AFTER `acti_proc_inst_id`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java index 446d76baa..a35a621f2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java @@ -98,4 +98,9 @@ public class LawsOpinionAssessmentResultEO implements Serializable { @ApiModelProperty(value = "流程实例id") private String actiProcInstId; + /**条款内容*/ + @Excel(name = "条款内容", width = 15) + @ApiModelProperty(value = "条款内容") + private String clauseContent; + } 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 5e5acc773..3ba440572 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 @@ -184,11 +184,11 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl