Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev

zhongrj

2023-07-05 f9b71f332b6a2d12151f20eeb6c68caa2a754eaa

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/RulesServiceImpl.java

@@ -24,6 +24,7 @@
public class RulesServiceImpl extends BaseServiceImpl<RulesMapper, Rules> implements IRulesService {
   private final IRulesConditionService rulesConditionService;


   @Override
   public IPage<Rules> selectRulesPage(IPage<Rules> page, Rules rules) {
      return page.setRecords(baseMapper.selectRulesPage(page,rules));
@@ -42,7 +43,6 @@

      //批量保存condition
      boolean saveCondition = rulesConditionService.saveBatch(rulesVO.getRulesConditionList());

      return saveRules&&saveCondition;
   }

@@ -52,15 +52,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,7 +72,7 @@
      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;