From 9dd34bd320539d36aaf39ac9d696b583197e4048 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 12 Dec 2022 10:57:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93-=E5=8E=86=E5=8F=B2l?= =?UTF-8?q?og=E6=96=B0=E5=A2=9E=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=EF=BC=8C=E5=8E=86=E5=8F=B2=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E5=B1=95=E7=A4=BA=E3=80=82=E3=80=82=20?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93-=E5=8F=82=E6=95=B0=E9=A1=B9?= =?UTF-8?q?=E5=88=97=E8=A1=A8-=E5=8E=BB=E9=99=A4=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 7 ++++++- .../ParamsCollectManifestEOController.java | 13 ++++--------- .../service/IParamsCollectManifestEOService.java | 2 +- .../impl/ParamsCollectManifestEOServiceImpl.java | 13 +++++++++++-- .../cert/report/entity/ParamsReportDetailLogEO.java | 4 ++++ .../mapper/xml/ParamsReportDetailLogEOMapper.xml | 5 +++-- .../impl/ParamsReportDetailEOServiceImpl.java | 9 +++++++++ 7 files changed, 38 insertions(+), 15 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 09553a281..977491362 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -73,4 +73,9 @@ INSERT INTO `laws_weilai`.`onl_cgform_field`(`id`, `cgform_head_id`, `db_field_n ALTER TABLE `laws_weilai`.`params_manifest_history` ADD COLUMN `references_col_name` varchar(255) NULL COMMENT '参数项清单的参考列名称' AFTER `project_version_id`; ALTER TABLE `laws_weilai`.`params_info_publish` - CHANGE COLUMN `version` `publish_version` int(11) NULL DEFAULT NULL COMMENT '发布时版本' AFTER `params_template_id`; \ No newline at end of file + CHANGE COLUMN `version` `publish_version` int(11) NULL DEFAULT NULL COMMENT '发布时版本' AFTER `params_template_id`; + + +-- 上报库历史表，增加备注字段 2022-12-12 未同步生产环境 +ALTER TABLE `laws_weilai`.`params_report_detail_log` + ADD COLUMN `remarks` varchar(4000) NULL COMMENT '备注' AFTER `params_report_detail_id`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index 7bcd40a3e..a0fa51878 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -581,12 +581,7 @@ public class ParamsCollectManifestEOController extends JeroController mandatoryWithdraw(ParamsCollectManifestVO paramsCollectManifestVO) { return this.paramsCollectManifestEOService.mandatoryWithdraw(paramsCollectManifestVO); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java index 1ca387bb7..d64b702f5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java @@ -183,7 +183,7 @@ public interface IParamsCollectManifestEOService extends IService addReferencesCol(String paramsManifestId, String paramsReportId, String paramsReportConfigId, String paramsReportConfigName); // 认证工程师-更新参考列 boolean updateReferencesCol(List> configDataList, String paramsManifestId); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index dc358f09c..07b15c5a5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ZipUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -4975,7 +4976,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl addReferencesCol(String paramsManifestId, String paramsReportId, String paramsReportConfigId, String paramsReportConfigName) { // 获取清单参数项 ParamsCollectManifestEO queryEO = new ParamsCollectManifestEO(); queryEO.setParamsManifestId(paramsManifestId); @@ -5027,7 +5028,15 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl + - \ No newline at end of file + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index e0944d306..36e6ebe84 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -137,6 +137,10 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl> listMap = new ArrayList<>(); list.forEach(collectManifestEO -> { // 参数收集清单 + + // 2022-12-12 上报库 参数项查看列表 备注设置为空。 + collectManifestEO.setRemarks(null); + // 处理数据字典字段 中英文切换 认证类型，责任领域 List certCategory = Arrays.asList(collectManifestEO.getCertCategory().split(",")); List dutyTerritory = Arrays.asList(collectManifestEO.getDutyTerritory().split(",")); @@ -1730,10 +1734,15 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl