认证-参数项收集-增加添加标识

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`,

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;
 

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_BEFORE("变更前","0"), // 指控件类型没变
-    CHANGE_AFTER("变更后","1"),
+    CHANGE_AFTER("变更后","1"), // 指控件类型变了
     DELETE_BEFORE("变更时未删除","0"),
-    DELETE_AFTER("变更时已删除","1");
+    DELETE_AFTER("变更时已删除","1"),
+    ADD_BEFORE("非添加参数项","0"),
+    ADD_AFTER("添加参数项","1");
 
     String name;
     String value;

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml

@@ -28,6 +28,7 @@
         <result column="params_manifest_id" property="paramsManifestId" />
         <result column="change_flag" property="changeFlag" />
         <result column="del_flag" property="delFlag" />
+        <result column="add_flag" property="addFlag" />
     </resultMap>
     <sql id="BaseQuerySql">
         <where>
@@ -75,7 +76,7 @@
         select *
         from params_collect_manifest
         <include refid="BaseQuerySql"/>
-        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
     </select>
 
 </mapper>

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<ParamsCollec
 			target.setId(UUID.randomUUID().toString().replace("-",""));
 			target.setParamsManifestId(paramsManifestId);
 			target.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
+			target.setDelFlag(CollectManifestChangeFlagEnum.DELETE_BEFORE.getValue()); // 设置删除标识
+			target.setAddFlag(CollectManifestChangeFlagEnum.ADD_AFTER.getValue()); // 设置添加标识
+			target.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); // 设置变更标识
 
 			Date date = new Date();
 			target.setCreateBy(user.getUsername());

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java

@@ -115,6 +115,10 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 			target.setId(UUID.randomUUID().toString().replace("-",""));
 			target.setParamsManifestId(paramsManifestId);
 			target.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
+			target.setDelFlag(CollectManifestChangeFlagEnum.DELETE_BEFORE.getValue()); // 设置删除标识
+			target.setAddFlag(CollectManifestChangeFlagEnum.ADD_BEFORE.getValue()); // 设置添加标识
+			target.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); // 设置变更标识
+
 
 			// 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
 			ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(paramsManifestEO.getProjectId(), source.getDutyTerritory());
@@ -395,6 +399,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 				updateCollectManifestEO.setState(CollectManifestStateEnum.CHANGE.getValue());
 				updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); // 标记为变更前参数项
 				updateCollectManifestEO.setDelFlag(CollectManifestChangeFlagEnum.DELETE_AFTER.getValue()); // 因新发布模板中没有该参数项，标记为变更时已删除参数项
+				updateCollectManifestEO.setAddFlag(CollectManifestChangeFlagEnum.ADD_BEFORE.getValue()); // 非添加参数项
 
 				updateCollectManifestEOList.add(updateCollectManifestEO);
 			}
@@ -428,6 +433,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 					updateCollectManifestEO.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
 					updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_AFTER.getValue()); // 因新发布模板中该参数项控件变化，标记为变更后参数项
 					updateCollectManifestEO.setDelFlag(CollectManifestChangeFlagEnum.DELETE_BEFORE.getValue()); // 标记为变更时未删除参数项
+					updateCollectManifestEO.setAddFlag(CollectManifestChangeFlagEnum.ADD_BEFORE.getValue()); // 非添加参数项
 //				updateCollectManifestEO.setControlType(newControlType);
 //				updateCollectManifestEO.setControlVerify(newControlVerify);
 //				updateCollectManifestEO.setControlValues(newControlValues);
@@ -439,6 +445,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 					updateCollectManifestEO.setState(CollectManifestStateEnum.CHANGE.getValue());
 					updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); // 标记为变更前参数项
 					updateCollectManifestEO.setDelFlag(CollectManifestChangeFlagEnum.DELETE_BEFORE.getValue()); // 标记为变更时未删除参数项
+					updateCollectManifestEO.setAddFlag(CollectManifestChangeFlagEnum.ADD_BEFORE.getValue()); // 非添加参数项
 
 				}
 				// 更新附件模板字段