优化 折扣 规则名称显示

java110-bean/src/main/java/com/java110/dto/feeDiscount/FeeDiscountDto.java

@@ -23,6 +23,7 @@ public class FeeDiscountDto extends PageDto implements Serializable {
     private String discountId;
     private String communityId;
     private String ruleId;
+    private String ruleName;
 
     private List<FeeDiscountSpecDto> feeDiscountSpecs;
 
@@ -104,4 +105,12 @@ public class FeeDiscountDto extends PageDto implements Serializable {
     public void setFeeDiscountSpecs(List<FeeDiscountSpecDto> feeDiscountSpecs) {
         this.feeDiscountSpecs = feeDiscountSpecs;
     }
+
+    public String getRuleName() {
+        return ruleName;
+    }
+
+    public void setRuleName(String ruleName) {
+        this.ruleName = ruleName;
+    }
 }

java110-db/src/main/resources/mapper/fee/FeeDiscountServiceDaoImplMapper.xml

@@ -20,8 +20,9 @@
         select t.discount_name,t.discount_name discountName,t.discount_desc,t.discount_desc
         discountDesc,t.discount_type,t.discount_type discountType,t.status_cd,t.status_cd
         statusCd,t.discount_id,t.discount_id discountId,t.community_id,t.community_id communityId,t.rule_id,t.rule_id
-        ruleId,t.create_time createTime
+        ruleId,t.create_time createTime,fdr.rule_name ruleName
         from fee_discount t
+        left join fee_discount_rule fdr on t.rule_id = fdr.rule_id and fdr.status_cd = '0'
         where 1 =1
         <if test="discountName !=null and discountName != ''">
             and t.discount_name= #{discountName}