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

修改参数模版发布，加遮罩

Browse Source
This commit is contained in:
gaosong
2023-11-18 14:07:44 +08:00
parent 13f034fb98
commit cc4e548d0f
3 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
+1 -1
View File
@@ -52,7 +52,7 @@
pm.params_template_publish_version as params_template_publish_version,
pm.project_version as project_version,
pm.explanation as explanation,
if (pt.params_template_name is not null, pt.params_template_name, pm.params_template_name) as params_template_name
pt.params_template_name as params_template_name
</sql>
<sql id="BaseQuerySql">
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+20 -8
View File
@@ -158,17 +158,20 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
@Override
public List<ParamsManifestEO> queryList(ParamsManifestEO paramsManifestEO) {
IPage page = new Page(1, 100);
IPage pageList = pageInfo(page, paramsManifestEO);
List<ParamsManifestEO> resList = new ArrayList<>();
LambdaQueryWrapper<ParamsManifestEO> queryWrapper = new LambdaQueryWrapper<>();
if(StringUtils.isNotEmpty(paramsManifestEO.getTitle())){
queryWrapper.eq(ParamsManifestEO::getTitle, paramsManifestEO.getTitle());
}
queryWrapper.eq(ParamsManifestEO::getProjectId, paramsManifestEO.getProjectId());
List<ParamsManifestEO> paramsManifestEOList = list(queryWrapper);
resList.addAll(paramsManifestEOList);
// LambdaQueryWrapper<ParamsManifestEO> queryWrapper = new LambdaQueryWrapper<>();
// if(StringUtils.isNotEmpty(paramsManifestEO.getTitle())){
// queryWrapper.eq(ParamsManifestEO::getTitle, paramsManifestEO.getTitle());
// }
// queryWrapper.eq(ParamsManifestEO::getProjectId, paramsManifestEO.getProjectId());
List<ParamsManifestEO> paramsManifestEOList = pageList.getRecords();
for (ParamsManifestEO pm : paramsManifestEOList) {
pm.setIsHistory("0");
}
resList.addAll(paramsManifestEOList);
List<ParamsManifestHistoryEO> hisList = paramsManifestHistoryEOService.getHistoryListByProjectId(paramsManifestEO.getProjectId());
if(CollectionUtils.isNotEmpty(hisList)){
for (ParamsManifestHistoryEO his : hisList) {
@@ -280,6 +283,9 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
LambdaQueryWrapper<ParamsCollectManifestEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsCollectManifestEO::getParamsManifestId, cid);
List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOService.list(queryWrapper);
for (ParamsCollectManifestEO peo:paramsCollectManifestEOList) {
peo.setState(CollectManifestStateEnum.WAIT_FILL.getValue());
}
// 根据参数模板id发布版本查询对应参数项集合
List<ParamsInfoPublishEO> paramsInfoPublishEOList = paramsInfoPublishEOService.getListByPublishVersion(mid, Integer.parseInt(version));
@@ -294,7 +300,13 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
target.setParamsName(source.getParamsName());
target.setParamsBatch(source.getParamsBatch());
target.setDutyTerritory(source.getDutyTerritory());
if(!StringUtils.equals(source.getControlType(),target.getControlType())){
target.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
}
target.setControlType(source.getControlType());
if(!StringUtils.equals(source.getControlValues(),target.getControlValues())){
target.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
}
target.setControlValues(source.getControlValues());
target.setControlVerify(source.getControlVerify());
target.setFileTemplateConnectId(source.getFileTemplateConnectId());
@@ -307,7 +319,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
BeanUtils.copyProperties(source, target);
target.setId(UUID.randomUUID().toString().replace("-", ""));
target.setParamsManifestId(cid);
target.setState(CollectManifestStateEnum.WAIT_FILL.getValue());
target.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
target.setDelFlag(CollectManifestChangeFlagEnum.DELETE_BEFORE.getValue()); // 设置删除标识
target.setAddFlag(CollectManifestChangeFlagEnum.ADD_BEFORE.getValue()); // 设置添加标识
target.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); // 设置变更标识
jero-web/src/views/parameter/ParameterTemplate/index.vue
+7
View File
@@ -91,6 +91,7 @@
@showSizeChange="SizeChange"
/>
</div>
<JLoading :loading="JLoading">{{ $t('pleaseWaitWhileRunning') }}</JLoading>
<addModel :url="url" ref="addModelRef" @addModelList="addModelList"/>
<a-modal class="show-copy" v-model="areaVisible" :title="$t('templateCopy')" :footer="null" @cancel="hideModal">
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
@@ -139,6 +140,7 @@ export default {
token:Vue.ls.get(ACCESS_TOKEN),
loading: false,
toggleSearchStatus: false,
JLoading:false,
selectedRowKeys: [],
selectedRowKeysArray: '',
orderBy: '1',
@@ -299,13 +301,16 @@ export default {
this.$confirm({
content: item.status && item.status == '1' ? _this.$t('confirmWithdraw') : _this.$t('confirmRelease'),
onOk() {
_this.JLoading = true
if (item.status && item.status == '1'){
getAction('params/paramsInfo/withdraw', { paramsTemplateId: item.id }).then((res) => {
if (res.success) {
_this.$message.success(res.result)
_this.getList()
_this.JLoading = false
} else {
_this.$message.warning(res.message)
_this.JLoading = false
}
})
}else{
@@ -313,8 +318,10 @@ export default {
if (res.success) {
_this.$message.success(res.result)
_this.getList()
_this.JLoading = false
} else {
_this.$message.warning(res.message)
_this.JLoading = false
}
})
}