规则条件表增加附加信息

src/main/java/com/diagbot/aggregate/RuleAggregate.java

@@ -55,11 +55,11 @@ public class RuleAggregate {
                             for (String key : map.keySet()) {
                                 RuleConditionDTO ruleConditionDTO = new RuleConditionDTO();
                                 ruleConditionDTO.setHasSubCond(ruleInitDTO.getHasSubCond());
-                                ruleConditionDTO.setMsg(ruleInitDTO.getMsg());
                                 ruleConditionDTO.setRuleGroup(key);
                                 //结果判空第三层条件明细
                                 if (ListUtil.isNotEmpty(map.get(key))) {
                                     for (RuleConditionInitDTO ruleConditionInitDTO : map.get(key)) {
+                                        ruleConditionDTO.setMsg(ruleConditionInitDTO.getMsg());
                                         RuleBaseDTO ruleBaseDTO = new RuleBaseDTO();
                                         BeanUtil.copyProperties(ruleBaseInits.get(ruleConditionInitDTO.getRuleBaseId()), ruleBaseDTO);
                                         ruleConditionDTO.getRuleBaseDTOList().add(ruleBaseDTO);

src/main/java/com/diagbot/dto/RuleConditionInitDTO.java

@@ -3,9 +3,6 @@ package com.diagbot.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * @Description:
  * @author: gaodm
@@ -17,4 +14,5 @@ public class RuleConditionInitDTO {
     private Integer ruleId;
     private String ruleGroup;
     private Integer ruleBaseId;
+    private String msg;
 }

src/main/resources/mapper/KlRuleMapper.xml

@@ -321,7 +321,8 @@
         SELECT
             t2.rule_id AS ruleId,
             CONCAT_WS("-", t2.rule_id, t2.group_type) AS ruleGroup,
-            t2.rule_base_id as ruleBaseId
+            t2.rule_base_id as ruleBaseId,
+            t2.msg as msg
         FROM
             kl_rule_condition t2
         ORDER BY