From 09c88b352e7b6e5d645c5b7362f5598d54f150e6 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 7 Jun 2022 23:55:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E9=99=84=E4=BB=B6=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql | 10 ++++++++++ .../collect/entity/ParamsCollectManifestBaseEO.java | 2 +- .../mapper/xml/ParamsCollectManifestEOMapper.xml | 2 +- .../xml/ParamsCollectManifestHistoryEOMapper.xml | 2 +- .../impl/ParamsCollectManifestEOServiceImpl.java | 4 ++-- .../report/mapper/xml/ParamsReportDetailEOMapper.xml | 2 +- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql b/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql index bea2804cb..38b7e6d0d 100644 --- a/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql +++ b/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql @@ -36,3 +36,13 @@ ALTER TABLE `laws_weilai`.`ocr_record` ---拆分记录表 添加字段 ALTER TABLE `laws_weilai`.`sar_file_split_info` ADD COLUMN `title_en` varchar(255) NULL COMMENT '英文标题' AFTER `connect_id`; + +---2022-06-07 +ALTER TABLE `laws_weilai`.`params_collect_manifest` + CHANGE COLUMN `file_template` `file_template_connect_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件模板' AFTER `control_verify`; + +ALTER TABLE `laws_weilai`.`params_collect_manifest_history` + CHANGE COLUMN `file_template` `file_template_connect_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件模板' AFTER `control_verify`; + +ALTER TABLE `laws_weilai`.`params_report_detail` + CHANGE COLUMN `file_template` `file_template_connect_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件模板' AFTER `control_verify`; \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java index d88e237f3..5346caf15 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java @@ -104,7 +104,7 @@ public class ParamsCollectManifestBaseEO implements Serializable { /**附件模板*/ @Excel(name = "附件模板", width = 15) @ApiModelProperty(value = "附件模板") - private String fileTemplate; + private String fileTemplateConnectId; /**参数模板id*/ @Excel(name = "参数模板id", width = 15) 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 eaff585c2..794c1e696 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 @@ -19,7 +19,7 @@ - + diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml index fe002e106..65d85a714 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml @@ -18,7 +18,7 @@ - + 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 562c1ce5e..458ceb583 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 @@ -329,8 +329,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigDataVOList = new ArrayList<>(); String templateId = null; String templateName = null; - if (StringUtils.isNotEmpty(paramsCollectManifestEO.getFileTemplate())) { - List ossFiles = ossFileService.getFileInfosByConnectId(paramsCollectManifestEO.getFileTemplate()); + if (StringUtils.isNotEmpty(paramsCollectManifestEO.getFileTemplateConnectId())) { + List ossFiles = ossFileService.getFileInfosByConnectId(paramsCollectManifestEO.getFileTemplateConnectId()); if (CollectionUtil.isNotEmpty(ossFiles)) { templateId = ossFiles.get(0).getId(); 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 70d856572..c386f672d 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 @@ -19,7 +19,7 @@ - +