优化代码

java110-bean/src/main/java/com/java110/dto/payFeeConfigDiscount/PayFeeConfigDiscountDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.payFeeConfigDiscount;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,9 +16,12 @@ import java.util.Date;
 public class PayFeeConfigDiscountDto extends PageDto implements Serializable {
 
     private String configDiscountId;
-private String configId;
-private String discountId;
-private String communityId;
+    private String configId;
+    private String discountId;
+    private String communityId;
+
+    private String  discountName;
+    private String discountType;
 
 
     private Date createTime;
@@ -28,25 +32,32 @@ private String communityId;
     public String getConfigDiscountId() {
         return configDiscountId;
     }
-public void setConfigDiscountId(String configDiscountId) {
+
+    public void setConfigDiscountId(String configDiscountId) {
         this.configDiscountId = configDiscountId;
     }
-public String getConfigId() {
+
+    public String getConfigId() {
         return configId;
     }
-public void setConfigId(String configId) {
+
+    public void setConfigId(String configId) {
         this.configId = configId;
     }
-public String getDiscountId() {
+
+    public String getDiscountId() {
         return discountId;
     }
-public void setDiscountId(String discountId) {
+
+    public void setDiscountId(String discountId) {
         this.discountId = discountId;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 
@@ -66,4 +77,20 @@ public void setCommunityId(String communityId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getDiscountName() {
+        return discountName;
+    }
+
+    public void setDiscountName(String discountName) {
+        this.discountName = discountName;
+    }
+
+    public String getDiscountType() {
+        return discountType;
+    }
+
+    public void setDiscountType(String discountType) {
+        this.discountType = discountType;
+    }
 }

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

@@ -5,93 +5,91 @@
 <mapper namespace="payFeeConfigDiscountServiceDaoImpl">
 
 
-
-
-
     <!-- 保存费用项折扣信息 add by wuxw 2018-07-03 -->
     <insert id="savePayFeeConfigDiscountInfo" parameterType="Map">
         insert into pay_fee_config_discount(
-config_discount_id,config_id,discount_id,community_id
-) values (
-#{configDiscountId},#{configId},#{discountId},#{communityId}
-)
+        config_discount_id,config_id,discount_id,community_id
+        ) values (
+        #{configDiscountId},#{configId},#{discountId},#{communityId}
+        )
     </insert>
 
 
-
     <!-- 查询费用项折扣信息 add by wuxw 2018-07-03 -->
     <select id="getPayFeeConfigDiscountInfo" parameterType="Map" resultType="Map">
-        select  t.config_discount_id,t.config_discount_id configDiscountId,t.config_id,t.config_id configId,t.status_cd,t.status_cd statusCd,t.discount_id,t.discount_id discountId,t.community_id,t.community_id communityId 
-from pay_fee_config_discount t 
-where 1 =1 
-<if test="configDiscountId !=null and configDiscountId != ''">
-   and t.config_discount_id= #{configDiscountId}
-</if> 
-<if test="configId !=null and configId != ''">
-   and t.config_id= #{configId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="discountId !=null and discountId != ''">
-   and t.discount_id= #{discountId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.config_discount_id,t.config_discount_id configDiscountId,t.config_id,t.config_id
+        configId,t.status_cd,t.status_cd statusCd,t.discount_id,t.discount_id discountId,t.community_id,t.community_id
+        communityId,fd.discount_name discountName,fd.discount_type discountType
+        from pay_fee_config_discount t
+        left join fee_discount fd on t.discount_id = fd.discount_id and t.community_id = fd.community_id and fd.status_cd = '0'
+        where 1 =1
+        <if test="configDiscountId !=null and configDiscountId != ''">
+            and t.config_discount_id= #{configDiscountId}
+        </if>
+        <if test="configId !=null and configId != ''">
+            and t.config_id= #{configId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="discountId !=null and discountId != ''">
+            and t.discount_id= #{discountId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改费用项折扣信息 add by wuxw 2018-07-03 -->
     <update id="updatePayFeeConfigDiscountInfo" parameterType="Map">
-        update  pay_fee_config_discount t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="configId !=null and configId != ''">
-, t.config_id= #{configId}
-</if> 
-<if test="discountId !=null and discountId != ''">
-, t.discount_id= #{discountId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
- where 1=1 <if test="configDiscountId !=null and configDiscountId != ''">
-and t.config_discount_id= #{configDiscountId}
-</if> 
+        update pay_fee_config_discount t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="configId !=null and configId != ''">
+            , t.config_id= #{configId}
+        </if>
+        <if test="discountId !=null and discountId != ''">
+            , t.discount_id= #{discountId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        where 1=1
+        <if test="configDiscountId !=null and configDiscountId != ''">
+            and t.config_discount_id= #{configDiscountId}
+        </if>
 
     </update>
 
     <!-- 查询费用项折扣数量 add by wuxw 2018-07-03 -->
-     <select id="queryPayFeeConfigDiscountsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from pay_fee_config_discount t 
-where 1 =1 
-<if test="configDiscountId !=null and configDiscountId != ''">
-   and t.config_discount_id= #{configDiscountId}
-</if> 
-<if test="configId !=null and configId != ''">
-   and t.config_id= #{configId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="discountId !=null and discountId != ''">
-   and t.discount_id= #{discountId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
+    <select id="queryPayFeeConfigDiscountsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from pay_fee_config_discount t
+        where 1 =1
+        <if test="configDiscountId !=null and configDiscountId != ''">
+            and t.config_discount_id= #{configDiscountId}
+        </if>
+        <if test="configId !=null and configId != ''">
+            and t.config_id= #{configId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="discountId !=null and discountId != ''">
+            and t.discount_id= #{discountId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>