From d5aef2e06c79541ed003af44e621df7c57fcf2e7 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 29 Jan 2024 16:02:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesServiceImpl.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesServiceImpl.java
index 2312c6c..0069f80 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesServiceImpl.java
@@ -42,7 +42,6 @@
//批量保存condition
boolean saveCondition = rulesConditionService.saveBatch(rulesVO.getRulesConditionList());
-
return saveRules&&saveCondition;
}
@@ -52,15 +51,16 @@
//更新rules
boolean updateRules = updateById(rulesVO);
+ RulesCondition rulesCondition = new RulesCondition();
+ rulesCondition.setRuleId(rulesVO.getId().toString());
+ List<RulesCondition> list = rulesConditionService.list(Condition.getQueryWrapper(rulesCondition));
+ list.forEach(e->{
+ rulesConditionService.physicDelete(e.getId());
+ });
+
rulesVO.getRulesConditionList().forEach(condition->{
- //有id，更新
- if (ObjectUtil.isNotEmpty(condition.getId())){
- rulesConditionService.updateById(condition);
- }else {
- //没id，赋rulesId
- condition.setRuleId(rulesVO.getId().toString());
- rulesConditionService.save(condition);
- }
+ condition.setRuleId(rulesVO.getId().toString());
+ rulesConditionService.save(condition);
});
return updateRules;
}
@@ -71,9 +71,20 @@
RulesCondition rulesCondition = new RulesCondition();
rulesCondition.setRuleId(id);
- List<RulesCondition> list = rulesConditionService.list(Condition.getQueryWrapper(rulesCondition));
+ List<RulesCondition> list = rulesConditionService.list(Condition.getQueryWrapper(rulesCondition).orderByDesc("RELATION"));
rulesVO.setRulesConditionList(list);
return rulesVO;
}
+
+ @Override
+ @Transactional
+ public Boolean customizeRemove(String id) {
+ boolean removeRule = removeById(id);
+ RulesCondition rulesCondition = new RulesCondition();
+ rulesCondition.setRuleId(id);
+ List<RulesCondition> list = rulesConditionService.list(Condition.getQueryWrapper(rulesCondition));
+ boolean removeCondition = rulesConditionService.removeBatchByIds(list);
+ return removeRule&&removeCondition;
+ }
}
--
Gitblit v1.9.3