WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

认证-参数项收集-变更扩展添加删除标识(红色底色)

Browse Source
This commit is contained in:
liyawei
2022-06-27 10:36:43 +08:00
parent dd5db0cbeb
commit 3494e0cc9a
6 changed files with 89 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/dev_third_record.sql
+3 -1
View File
@@ -58,4 +58,6 @@ CREATE TABLE `laws_process_history` (
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规-流程历史表' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规-流程历史表' ROW_FORMAT = Dynamic;
-- 参数项收集清单表 添加字段
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`;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java
+5
View File
@@ -35,6 +35,11 @@ public class ParamsCollectManifestEO extends ParamsCollectManifestBaseEO impleme
@ApiModelProperty(value = "变更标识") @ApiModelProperty(value = "变更标识")
private String changeFlag; private String changeFlag;
/**删除标识*/
@Excel(name = "删除标识", width = 15)
@ApiModelProperty(value = "删除标识")
private String delFlag;
@TableField(exist = false) @TableField(exist = false)
private String userTypes; private String userTypes;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestChangeFlagEnum.java
+3 -1
View File
@@ -7,7 +7,9 @@ package com.jero.modules.cert.collect.enums;
*/ */
public enum CollectManifestChangeFlagEnum { public enum CollectManifestChangeFlagEnum {
CHANGE_BEFORE("变更前","0"), CHANGE_BEFORE("变更前","0"),
CHANGE_AFTER("变更后","1"); CHANGE_AFTER("变更后","1"),
DELETE_BEFORE("变更时未删除","0"),
DELETE_AFTER("变更时已删除","1");
String name; String name;
String value; String value;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
+1
View File
@@ -27,6 +27,7 @@
<result column="deadline" property="deadline" /> <result column="deadline" property="deadline" />
<result column="params_manifest_id" property="paramsManifestId" /> <result column="params_manifest_id" property="paramsManifestId" />
<result column="change_flag" property="changeFlag" /> <result column="change_flag" property="changeFlag" />
<result column="del_flag" property="delFlag" />
</resultMap> </resultMap>
<sql id="BaseQuerySql"> <sql id="BaseQuerySql">
<where> <where>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+58 -37
View File
@@ -378,57 +378,78 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
// 比较模板参数项 和 项目参数项 // 比较模板参数项 和 项目参数项
// nio编号一样时，比较参数填写规则（控件类型，控件备选值，控件校验）是否一样；nio编号不一样时，不用管，用户自己添加 // nio编号一样时，比较参数填写规则（控件类型，控件备选值，控件校验）是否一样；nio编号不一样时，不用管，用户自己添加
List<String> nioNumberList = oldParamsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList()); List<String> oldNioNumberList = oldParamsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList());
List<ParamsInfoPublishEO> sameList = newParamsInfoPublishEOList.stream().filter(e->nioNumberList.contains(e.getNioNumber())).collect(Collectors.toList()); List<ParamsInfoPublishEO> sameList = newParamsInfoPublishEOList.stream().filter(e->oldNioNumberList.contains(e.getNioNumber())).collect(Collectors.toList());
List<String> newNioNumberList = sameList.stream().map(ParamsInfoPublishEO::getNioNumber).collect(Collectors.toList());
List<ParamsCollectManifestEO> diffList = oldParamsCollectManifestEOList.stream().filter(e->!newNioNumberList.contains(e.getNioNumber())).collect(Collectors.toList());
List<String> delCollectManifestIdList = new ArrayList<>(); List<String> delCollectManifestIdList = new ArrayList<>();
List<ParamsCollectManifestEO> updateCollectManifestEOList = new ArrayList<>(); List<ParamsCollectManifestEO> updateCollectManifestEOList = new ArrayList<>();
for (ParamsInfoPublishEO paramsInfoPublishEO : sameList) { // 模板里没有，清单里有
ParamsCollectManifestEO oldCollectManifestEO = oldParamsCollectManifestEOList.stream() if (CollectionUtil.isNotEmpty(diffList)) {
.filter(e->e.getNioNumber().equals(paramsInfoPublishEO.getNioNumber())) for (ParamsCollectManifestEO oldCollectManifestEO : diffList) {
.collect(Collectors.toList()).get(0); ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
String newControlType = paramsInfoPublishEO.getControlType(); updateCollectManifestEO.setId(oldCollectManifestEO.getId());
String newControlVerify = paramsInfoPublishEO.getControlVerify(); updateCollectManifestEO.setState(CollectManifestStateEnum.CHANGE.getValue());
String newControlValues = paramsInfoPublishEO.getControlValues(); updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); // 标记为变更前参数项
updateCollectManifestEO.setDelFlag(CollectManifestChangeFlagEnum.DELETE_AFTER.getValue()); // 因新发布模板中没有该参数项，标记为变更时已删除参数项
String oldControlType = oldCollectManifestEO.getControlType(); updateCollectManifestEOList.add(updateCollectManifestEO);
String oldControlVerify = oldCollectManifestEO.getControlVerify(); }
String oldControlValues = oldCollectManifestEO.getControlValues(); }
ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO(); // 模板里有，清单里也有
BeanUtils.copyProperties(paramsInfoPublishEO, updateCollectManifestEO); if (CollectionUtil.isNotEmpty(sameList)) {
// 比较参数填写规则 for (ParamsInfoPublishEO paramsInfoPublishEO : sameList) {
if (!newControlType.equals(oldControlType) ParamsCollectManifestEO oldCollectManifestEO = oldParamsCollectManifestEOList.stream()
|| (newControlVerify != null && !newControlVerify.equals(oldControlVerify)) .filter(e -> e.getNioNumber().equals(paramsInfoPublishEO.getNioNumber()))
|| (oldControlVerify != null && !oldControlVerify.equals(newControlVerify)) .collect(Collectors.toList()).get(0);
|| (newControlValues != null && !newControlValues.equals(oldControlValues)) String newControlType = paramsInfoPublishEO.getControlType();
|| (oldControlValues != null && !oldControlValues.equals(newControlValues))) { String newControlVerify = paramsInfoPublishEO.getControlVerify();
String newControlValues = paramsInfoPublishEO.getControlValues();
// 参数填写规则改变，删除参数项配置数据，状态变为：待发起收集，拍列表前边 String oldControlType = oldCollectManifestEO.getControlType();
updateCollectManifestEO.setId(oldCollectManifestEO.getId()); // 为收集参数项id String oldControlVerify = oldCollectManifestEO.getControlVerify();
updateCollectManifestEO.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue()); String oldControlValues = oldCollectManifestEO.getControlValues();
updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_AFTER.getValue());
ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
BeanUtils.copyProperties(paramsInfoPublishEO, updateCollectManifestEO);
// 比较参数填写规则
if (!newControlType.equals(oldControlType)
|| (newControlVerify != null && !newControlVerify.equals(oldControlVerify))
|| (oldControlVerify != null && !oldControlVerify.equals(newControlVerify))
|| (newControlValues != null && !newControlValues.equals(oldControlValues))
|| (oldControlValues != null && !oldControlValues.equals(newControlValues))) {
// 参数填写规则改变，删除参数项配置数据，状态变为：待发起收集，拍列表前边
updateCollectManifestEO.setId(oldCollectManifestEO.getId()); // 为收集参数项id
updateCollectManifestEO.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_AFTER.getValue()); // 因新发布模板中该参数项控件变化，标记为变更后参数项
updateCollectManifestEO.setDelFlag(CollectManifestChangeFlagEnum.DELETE_BEFORE.getValue()); // 标记为变更时未删除参数项
// updateCollectManifestEO.setControlType(newControlType); // updateCollectManifestEO.setControlType(newControlType);
// updateCollectManifestEO.setControlVerify(newControlVerify); // updateCollectManifestEO.setControlVerify(newControlVerify);
// updateCollectManifestEO.setControlValues(newControlValues); // updateCollectManifestEO.setControlValues(newControlValues);
delCollectManifestIdList.add(oldCollectManifestEO.getId()); delCollectManifestIdList.add(oldCollectManifestEO.getId());
} else { } else {
// 参数填写规则没有改变，状态变为：变更 // 参数填写规则没有改变，状态变为：变更
updateCollectManifestEO.setId(oldCollectManifestEO.getId()); updateCollectManifestEO.setId(oldCollectManifestEO.getId());
updateCollectManifestEO.setState(CollectManifestStateEnum.CHANGE.getValue()); updateCollectManifestEO.setState(CollectManifestStateEnum.CHANGE.getValue());
updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); // 标记为变更前参数项
updateCollectManifestEO.setDelFlag(CollectManifestChangeFlagEnum.DELETE_BEFORE.getValue()); // 标记为变更时未删除参数项
} }
// 更新附件模板字段 // 更新附件模板字段
if (StringUtils.isNotEmpty(paramsInfoPublishEO.getFileTemplateConnectId())) { if (StringUtils.isNotEmpty(paramsInfoPublishEO.getFileTemplateConnectId())) {
updateCollectManifestEO.setFileTemplateConnectId(paramsInfoPublishEO.getFileTemplateConnectId()); updateCollectManifestEO.setFileTemplateConnectId(paramsInfoPublishEO.getFileTemplateConnectId());
} }
updateCollectManifestEOList.add(updateCollectManifestEO); updateCollectManifestEOList.add(updateCollectManifestEO);
}
} }
// 删除参数项配置数据 // 删除参数项配置数据
if (CollectionUtil.isNotEmpty(delCollectManifestIdList)) { if (CollectionUtil.isNotEmpty(delCollectManifestIdList)) {
paramsConfigDataEOService.deleteByParamsCollectManifestIdList(delCollectManifestIdList); paramsConfigDataEOService.deleteByParamsCollectManifestIdList(delCollectManifestIdList);
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
+19 -1
View File
@@ -110,6 +110,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
LambdaQueryWrapper<ParamsInfoEO> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ParamsInfoEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsInfoEO::getNioNumber, paramsInfoEO.getNioNumber()); queryWrapper.eq(ParamsInfoEO::getNioNumber, paramsInfoEO.getNioNumber());
queryWrapper.eq(ParamsInfoEO::getParamsTemplateId, paramsInfoEO.getParamsTemplateId());
List<ParamsInfoEO> paramsInfoEOList = list(queryWrapper); List<ParamsInfoEO> paramsInfoEOList = list(queryWrapper);
if (CollectionUtil.isNotEmpty(paramsInfoEOList)) { if (CollectionUtil.isNotEmpty(paramsInfoEOList)) {
if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) { if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) {
@@ -189,6 +190,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
if (!oldParamsInfoEO.getNioNumber().equals(nioNumber)) { if (!oldParamsInfoEO.getNioNumber().equals(nioNumber)) {
LambdaQueryWrapper<ParamsInfoEO> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ParamsInfoEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsInfoEO::getNioNumber, paramsInfoEO.getNioNumber()); queryWrapper.eq(ParamsInfoEO::getNioNumber, paramsInfoEO.getNioNumber());
queryWrapper.eq(ParamsInfoEO::getParamsTemplateId, paramsInfoEO.getParamsTemplateId());
List<ParamsInfoEO> paramsInfoEOList = list(queryWrapper); List<ParamsInfoEO> paramsInfoEOList = list(queryWrapper);
if (CollectionUtil.isNotEmpty(paramsInfoEOList)) { if (CollectionUtil.isNotEmpty(paramsInfoEOList)) {
if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) { if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) {
@@ -1051,6 +1053,8 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
//存放数据验证结果信息 //存放数据验证结果信息
List<String> stringMessage = new ArrayList<>(); List<String> stringMessage = new ArrayList<>();
List<String> nioNumberImport = new ArrayList<>(); // 记录导入的nio编号
int i = 1; //记录行号 int i = 1; //记录行号
int num = 0; //记录是第几条数据 int num = 0; //记录是第几条数据
//循环验证数据 //循环验证数据
@@ -1080,12 +1084,26 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
String nioNumberRegex = "^[A-Za-z0-9-]+$"; String nioNumberRegex = "^[A-Za-z0-9-]+$";
if (!nioNumber.matches(nioNumberRegex)) { if (!nioNumber.matches(nioNumberRegex)) {
if(CutEnum.CN.getValue().equals(cut)) { if(CutEnum.CN.getValue().equals(cut)) {
errorMsg += "nio编号格式错误，仅能为字母，数字，横杠(-)；"; errorMsg += "NIO编号格式错误，仅能为字母，数字，横杠(-)；";
} else { } else {
errorMsg += "NIO number formatting errors, can only letters, numbers, dash (-);"; errorMsg += "NIO number formatting errors, can only letters, numbers, dash (-);";
} }
countError++; countError++;
} }
if (CollectionUtil.isNotEmpty(nioNumberImport)) {
if (nioNumberImport.contains(dto.getNioNumber())) {
if (CutEnum.CN.getValue().equals(cut)) {
errorMsg += "NIO编号重复！";
} else {
errorMsg += "NIO number already exists!";
}
countError++;
} else {
nioNumberImport.add(dto.getNioNumber());
}
} else {
nioNumberImport.add(dto.getNioNumber());
}
} }
// 是否必填 // 是否必填