规则字段里面加入描述的内容

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

@@ -74,6 +74,7 @@ public class RuleAggregate {
                                 for (String ruleGroup : map.keySet()) {
                                     RuleConditionDTO ruleConditionDTO = new RuleConditionDTO();
                                     ruleConditionDTO.setHasSubCond(ruleInitDTO.getHasSubCond());
+                                    ruleConditionDTO.setDescription(ruleInitDTO.getDescription());
                                     ruleConditionDTO.setRuleGroup(ruleGroup);
                                     //结果判空第三层条件明细
                                     if (ListUtil.isNotEmpty(map.get(ruleGroup))) {
@@ -98,6 +99,7 @@ public class RuleAggregate {
                                             RuleConditionDTO ruleConditionDTO1 = new RuleConditionDTO();
                                             ruleConditionDTO1.setHasSubCond(ruleConditionDTO.getHasSubCond());
                                             ruleConditionDTO1.setRuleGroup(ruleConditionDTO.getRuleGroup());
+                                            ruleConditionDTO1.setDescription(ruleConditionDTO.getDescription());
                                             ruleConditionDTO1.setMsg(ruleConditionDTO.getMsg());
                                             ruleConditionDTO1.getRuleBaseDTOList().addAll(ruleBaseDTOList);
                                             if (!ruleConditionMap.containsKey(ruleConditionDTO1.toString())) {
@@ -123,6 +125,7 @@ public class RuleAggregate {
                         } else {
                             RuleConditionDTO ruleConditionDTO = new RuleConditionDTO();
                             ruleConditionDTO.setHasSubCond(ruleInitDTO.getHasSubCond());
+                            ruleConditionDTO.setDescription(ruleInitDTO.getDescription());
                             ruleConditionDTO.setMsg(ruleInitDTO.getMsg());
                             //无条件
                             ruleConditionDTO.setRuleGroup(ruleInitDTO.getRuleId() + "-1");

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

@@ -14,10 +14,11 @@ import java.util.List;
  */
 @Getter
 @Setter
-@ToString(exclude = { "ruleGroup", "msg" }, includeFieldNames = false)
+@ToString(exclude = { "ruleGroup", "msg", "description" }, includeFieldNames = false)
 public class RuleConditionDTO {
     private Integer hasSubCond;
     private String ruleGroup;
     private String msg;
+    private String description;
     private List<RuleBaseDTO> ruleBaseDTOList = new ArrayList<>();
 }

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

@@ -22,4 +22,5 @@ public class RuleInitDTO {
     private Integer ruleType;
     private String msg;
     private Integer hasSubCond;
+    private String description;
 }

src/main/resources/mapper/KlRuleMapper.xml

@@ -318,6 +318,7 @@
                     t4.lib_type AS libType,
                     t1.rule_type AS ruleType,
                     t1.has_sub_cond AS hasSubCond,
+                    t1.description AS description,
                     t1.msg AS msg,
                     t1.gmt_modified AS gmtModified
                 FROM
@@ -339,6 +340,7 @@
                         t11.lib_type AS libType,
                         t1.rule_type AS ruleType,
                         t1.has_sub_cond AS hasSubCond,
+                        t1.description AS description,
                         t1.msg AS msg,
                         t1.gmt_modified AS gmtModified
                     FROM