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-05-19 15:25:58 +08:00
parent 96496e961f
commit 846a5878ba
2 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+29 -11
View File
@@ -234,16 +234,31 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
Boolean finish = (Boolean) map.get("finish");
Date time = (Date) map.get("time");
if (finish) {
manifestEO.setState(ManifestStateEnum.FINISHED.getValue());
manifestEO.setFinishTime(time);
if (ManifestStateEnum.COLLECTING.getValue().equals(manifestEO.getState())) {
manifestEO.setState(ManifestStateEnum.FINISHED.getValue());
manifestEO.setFinishTime(time);
// 更新清单状态和完成时间
ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO();
updateParamsManifestEO.setId(manifestEO.getId());
updateParamsManifestEO.setState(ManifestStateEnum.FINISHED.getValue());
updateParamsManifestEO.setFinishTime(time);
updateById(updateParamsManifestEO);
// 更新清单状态和完成时间
ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO();
updateParamsManifestEO.setId(manifestEO.getId());
updateParamsManifestEO.setState(ManifestStateEnum.FINISHED.getValue());
updateParamsManifestEO.setFinishTime(time);
updateById(updateParamsManifestEO);
}
} else {
if (ManifestStateEnum.FINISHED.getValue().equals(manifestEO.getState())) {
manifestEO.setState(ManifestStateEnum.COLLECTING.getValue());
manifestEO.setFinishTime(null);
// 更新清单状态和完成时间
ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO();
updateParamsManifestEO.setId(manifestEO.getId());
updateParamsManifestEO.setState(ManifestStateEnum.FINISHED.getValue());
updateParamsManifestEO.setFinishTime(time);
updateById(updateParamsManifestEO);
}
}
});
return rows;
@@ -270,7 +285,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
throw new JeroBootException("清单收集中，无法发起变更！");
}
// 查询项目引用的模板是否是最新版本
Integer newestVersion = paramsInfoPublishEOService.getNewestVersionByParamsTemplateId(id);
Integer newestVersion = paramsInfoPublishEOService.getNewestVersionByParamsTemplateId(paramsManifestEO.getParamsTemplateId());
if (newestVersion == null) {
throw new JeroBootException("查询不到模板最新发布版本！");
}
@@ -280,7 +295,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
}
// 查询最新版模板参数项
List<ParamsInfoPublishEO> newParamsInfoPublishEOList = paramsInfoPublishEOService.getListByPublishVersion(id, newestVersion);
List<ParamsInfoPublishEO> newParamsInfoPublishEOList = paramsInfoPublishEOService.getListByPublishVersion(paramsManifestEO.getParamsTemplateId(), newestVersion);
// 查询项目所有参数项（这时候参数项都收集完了）
ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
paramsCollectManifestEO.setParamsManifestId(id);
@@ -331,9 +346,12 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
}
// 删除参数项配置数据
paramsConfigDataEOService.deleteByParamsCollectManifestIdList(delCollectManifestIdList);
if (CollectionUtil.isNotEmpty(delCollectManifestIdList)) {
paramsConfigDataEOService.deleteByParamsCollectManifestIdList(delCollectManifestIdList);
}
// 更新项目参数项
paramsCollectManifestEOService.updateBatchById(updateCollectManifestEOList);
// 参数清单版本加 1
ParamsManifestEO updateManifestEO = new ParamsManifestEO();
updateManifestEO.setId(id);
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java
-6
View File
@@ -126,12 +126,6 @@ public class ParamsManifestHistoryEOServiceImpl extends ServiceImpl<ParamsManife
// 添加清单
paramsManifestHistoryEOService.save(paramsManifestHistoryEO);
// 参数清单版加 1
ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO();
updateParamsManifestEO.setId(paramsManifestEO.getId());
updateParamsManifestEO.setVersion(paramsManifestEO.getVersion() + 1);
paramsManifestEOService.updateById(updateParamsManifestEO);
}
@Override