diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index de2030c9c..f5f06e242 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -61,6 +61,8 @@ CREATE TABLE `laws_process_history` ( -- 参数项收集清单表 添加字段 ALTER TABLE `laws_weilai`.`params_collect_manifest` ADD COLUMN `del_flag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标识' AFTER `change_flag`; +ALTER TABLE `laws_weilai`.`params_collect_manifest` + ADD COLUMN `add_flag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '添加标识' AFTER `del_flag`; -- 参数配置数据表 修改字段长度 ALTER TABLE `laws_weilai`.`params_config_data` MODIFY COLUMN `text_data` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文本类型数据' AFTER `sys_org_code`, diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java index 48e923c42..5e48be132 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java @@ -40,6 +40,11 @@ public class ParamsCollectManifestEO extends ParamsCollectManifestBaseEO impleme @ApiModelProperty(value = "删除标识") private String delFlag; + /**添加标识*/ + @Excel(name = "添加标识", width = 15) + @ApiModelProperty(value = "添加标识") + private String addFlag; + @TableField(exist = false) private String userTypes; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java index 399c666b1..7ea6f3a19 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java @@ -6,10 +6,12 @@ package com.jero.modules.cert.collect.enums; * @Date: Created in 17:49 2022/5/16 */ public enum CollectManifestChangeFlagEnum { - CHANGE_BEFORE("变更前","0"), - CHANGE_AFTER("变更后","1"), + CHANGE_BEFORE("变更前","0"), // 指控件类型没变 + CHANGE_AFTER("变更后","1"), // 指控件类型变了 DELETE_BEFORE("变更时未删除","0"), - DELETE_AFTER("变更时已删除","1"); + DELETE_AFTER("变更时已删除","1"), + ADD_BEFORE("非添加参数项","0"), + ADD_AFTER("添加参数项","1"); String name; String value; 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 462ac4cd3..a8bcc7f33 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 @@ -28,6 +28,7 @@ + @@ -75,7 +76,7 @@ select * from params_collect_manifest - order by del_flag desc, change_flag desc, nio_number asc + order by del_flag desc, add_flag desc, change_flag desc, nio_number asc \ No newline at end of file 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 67e8e1235..01e7d6712 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 @@ -142,6 +142,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl