From b3c34d018e08c5382c5cff68a7d58901e6984165 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 14 五月 2020 18:51:43 +0800
Subject: [PATCH] 优化代码 并合并 安装文档

---
 java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml |   47 +++++++++++++++++++++++++++++------------------
 1 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml
index 9dc7f60..927be84 100644
--- a/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml
@@ -6,20 +6,25 @@
 
     <!-- 淇濆瓨璐圭敤鏄庣粏淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessFeeDetailInfo" parameterType="Map">
-           insert into business_pay_fee_detail(
-operate,prime_rate,detail_id,receivable_amount,cycles,remark,received_amount,community_id,b_id,fee_id
-) values (
-#{operate},#{primeRate},#{detailId},#{receivableAmount},#{cycles},#{remark},#{receivedAmount},#{communityId},#{bId},#{feeId}
-)
+        insert into
+        business_pay_fee_detail(
+            operate,prime_rate,detail_id,
+            receivable_amount,cycles,remark,
+            received_amount,community_id,b_id,fee_id,state) values (
+            #{operate},#{primeRate},#{detailId},#{receivableAmount},
+            #{cycles},#{remark},#{receivedAmount},#{communityId},#{bId},#{feeId},#{state})
        </insert>
 
 
     <!-- 鏌ヨ璐圭敤鏄庣粏淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
     <select id="getBusinessFeeDetailInfo" parameterType="Map" resultType="Map">
-        select t.operate,t.prime_rate,t.prime_rate primeRate,t.detail_id,t.detail_id
-        detailId,t.receivable_amount,t.receivable_amount
-        receivableAmount,t.cycles,t.remark,t.received_amount,t.received_amount
-        receivedAmount,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.fee_id,t.fee_id feeId
+        select
+            t.operate,t.prime_rate,t.prime_rate primeRate,t.detail_id,
+            t.detail_id detailId,t.receivable_amount,
+            t.receivable_amount receivableAmount,t.cycles,
+            t.remark,t.received_amount,t.received_amount receivedAmount,
+            t.community_id,t.community_id communityId,t.b_id,t.b_id bId,
+            t.fee_id,t.fee_id feeId,t.state
         from business_pay_fee_detail t
         where 1 =1
         <if test="operate !=null and operate != ''">
@@ -58,10 +63,10 @@
 
     <!-- 淇濆瓨璐圭敤鏄庣粏淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
     <insert id="saveFeeDetailInfoInstance" parameterType="Map">
-        insert into pay_fee_detail(
-        prime_rate,detail_id,receivable_amount,cycles,remark,status_cd,received_amount,community_id,b_id,fee_id
-        ) select
-        t.prime_rate,t.detail_id,t.receivable_amount,t.cycles,t.remark,'0',t.received_amount,t.community_id,t.b_id,t.fee_id
+        insert into
+            pay_fee_detail(
+                prime_rate,detail_id,receivable_amount,cycles,remark,status_cd,received_amount,community_id,b_id,fee_id,state) select
+        t.prime_rate,t.detail_id,t.receivable_amount,t.cycles,t.remark,'0',t.received_amount,t.community_id,t.b_id,t.fee_id,state
         from business_pay_fee_detail t where 1=1
         and t.operate= 'ADD'
         <if test="primeRate !=null and primeRate != ''">
@@ -97,12 +102,15 @@
 
     <!-- 鏌ヨ璐圭敤鏄庣粏淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getFeeDetailInfo" parameterType="Map" resultType="Map">
-        select t.prime_rate,t.prime_rate primeRate,t.detail_id,t.detail_id
-        detailId,t.receivable_amount,t.receivable_amount receivableAmount,
-        t.cycles,t.remark,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount
-        receivedAmount,t.community_id,
-        t.community_id communityId,t.b_id,t.b_id bId,t.fee_id,t.fee_id feeId ,t.create_time createTime
+        select
+            t.prime_rate,t.prime_rate primeRate,
+            t.detail_id,t.detail_id detailId,
+            t.receivable_amount,t.receivable_amount receivableAmount,
+            t.cycles,t.remark,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount receivedAmount,
+            t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.fee_id,t.fee_id feeId ,t.create_time createTime,
+            t.state,d.name stateName
         from pay_fee_detail t
+        left join t_dict d on t.state = d.status_cd and d.table_name = 'pay_fee_detail' and d.table_columns = 'state'
         where 1 =1
         <if test="primeRate !=null and primeRate != ''">
             and t.prime_rate= #{primeRate}
@@ -173,6 +181,9 @@
         <if test="communityId !=null and communityId != ''">
             , t.community_id= #{communityId}
         </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
         <if test="feeId !=null and feeId != ''">
             , t.fee_id= #{feeId}
         </if>

--
Gitblit v1.8.0