From dd6687b118561100e1677e88a9c2f5842a54c531 Mon Sep 17 00:00:00 2001
From: jialh <1972868360@qq.com>
Date: 星期四, 16 四月 2026 18:14:14 +0800
Subject: [PATCH] 水电话费

---
 java110-db/src/main/resources/mapper/store/ContractCollectionDetailServiceDaoImpl.xml |  161 ++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 109 insertions(+), 52 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/store/ContractCollectionDetailServiceDaoImpl.xml b/java110-db/src/main/resources/mapper/store/ContractCollectionDetailServiceDaoImpl.xml
index f58e3dc..8c82f35 100644
--- a/java110-db/src/main/resources/mapper/store/ContractCollectionDetailServiceDaoImpl.xml
+++ b/java110-db/src/main/resources/mapper/store/ContractCollectionDetailServiceDaoImpl.xml
@@ -3,19 +3,39 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="contractCollectionDetailDaoImpl">
 
-    <!-- 淇濆瓨鍚堝悓鏀舵鏄庣粏淇℃伅 add by wuxw 2018-07-03 -->
+    <!-- 淇濆瓨鍚堝悓鏀舵鏄庣粏淇℃伅 -->
     <insert id="saveContractCollectionDetail" parameterType="Map">
-        insert into contract_collection_detail(contract_id, collection_period_start, collection_period_end,
-        receivable_money, collection_date, collection_amount,
-        special_reduction, unpaid_money, charge_type, invoice_receipt_no, white_list_archive_no)
-        values (#{contractId}, #{collectionPeriodStart}, #{collectionPeriodEnd},
-        #{receivableMoney}, #{collectionDate}, #{collectionAmount},
-        #{specialReduction}, #{unpaidMoney}, #{chargeType}, #{invoiceReceiptNo}, #{whiteListArchiveNo})
+        insert into contract_collection_detail(
+            contract_id,
+            collection_period_start,
+            collection_period_end,
+            receivable_money,
+            collection_date,
+            collection_amount,
+            special_reduction,
+            unpaid_money,
+            charge_type,
+            invoice_receipt_no,
+            white_list_archive_no
+        ) values (
+                     #{contractId},
+                     #{collectionPeriodStart},
+                     #{collectionPeriodEnd},
+                     #{receivableMoney},
+                     #{collectionDate},
+                     #{collectionAmount},
+                     #{specialReduction},
+                     #{unpaidMoney},
+                     #{chargeType},
+                     #{invoiceReceiptNo},
+                     #{whiteListArchiveNo}
+                 )
     </insert>
 
-    <!-- 鏌ヨ鍚堝悓鏀舵鏄庣粏淇℃伅 add by wuxw 2018-07-03 -->
+    <!-- 鏌ヨ鍚堝悓鏀舵鏄庣粏淇℃伅 -->
     <select id="getContractCollectionDetail" parameterType="Map" resultType="Map">
-        select t.id,
+        select
+        t.id,
         t.contract_id contractId,
         t.collection_period_start collectionPeriodStart,
         t.collection_period_end collectionPeriodEnd,
@@ -23,18 +43,21 @@
         t.collection_date collectionDate,
         t.collection_amount collectionAmount,
         t.special_reduction specialReduction,
-        t.unpaid_money unpaidMoney
+        t.unpaid_money unpaidMoney,
+        t.charge_type chargeType,
+        t.invoice_receipt_no invoiceReceiptNo,
+        t.white_list_archive_no whiteListArchiveNo
         from contract_collection_detail t
-        where 1 =1
+        where 1=1
         <if test="id != null and id != ''">
             and t.id = #{id}
         </if>
         <if test="contractId != null and contractId != ''">
             and t.contract_id = #{contractId}
         </if>
-        <if test="contractIds !=null">
+        <if test="contractIds != null">
             and t.contract_id in
-            <foreach collection="contractIds" item="item" index="index" open="(" close=")" separator=",">
+            <foreach collection="contractIds" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>
@@ -58,6 +81,15 @@
         </if>
         <if test="unpaidMoney != null and unpaidMoney != ''">
             and t.unpaid_money = #{unpaidMoney}
+        </if>
+        <if test="chargeType != null and chargeType != ''">
+            and t.charge_type = #{chargeType}
+        </if>
+        <if test="invoiceReceiptNo != null and invoiceReceiptNo != ''">
+            and t.invoice_receipt_no = #{invoiceReceiptNo}
+        </if>
+        <if test="whiteListArchiveNo != null and whiteListArchiveNo != ''">
+            and t.white_list_archive_no = #{whiteListArchiveNo}
         </if>
         order by t.id desc
         <if test="page != -1 and page != null ">
@@ -65,53 +97,67 @@
         </if>
     </select>
 
-    <!-- 淇敼鍚堝悓鏀舵鏄庣粏淇℃伅 add by wuxw 2018-07-03 -->
+    <!-- 淇敼鍚堝悓鏀舵鏄庣粏淇℃伅 -->
+    <!-- 淇敼鍚堝悓鏀舵鏄庣粏淇℃伅 -->
     <update id="updateContractCollectionDetail" parameterType="Map">
-        update contract_collection_detail t set
-        <if test="collectionPeriodStart !=null and collectionPeriodStart != ''">
-            t.collection_period_start= #{collectionPeriodStart},
-        </if>
-        <if test="collectionPeriodEnd !=null and collectionPeriodEnd != ''">
-            t.collection_period_end= #{collectionPeriodEnd},
-        </if>
-        <if test="receivableMoney !=null and receivableMoney != ''">
-            t.receivable_money= #{receivableMoney},
-        </if>
-        <if test="collectionDate !=null and collectionDate != ''">
-            t.collection_date= #{collectionDate},
-        </if>
-        <if test="collectionAmount !=null and collectionAmount != ''">
-            t.collection_amount= #{collectionAmount},
-        </if>
-        <if test="specialReduction !=null and specialReduction != ''">
-            t.special_reduction= #{specialReduction},
-        </if>
-        <if test="unpaidMoney !=null and unpaidMoney != ''">
-            t.unpaid_money= #{unpaidMoney}
-        </if>
+        update contract_collection_detail t
+        set
+        <!-- 鐢� trim 鑷姩鍘绘帀鏈�鍚庝竴涓�楀彿锛岃繖鏄� MyBatis 鏈�鏍囧噯鍐欐硶 -->
+        <trim suffixOverrides=",">
+            <if test="collectionPeriodStart != null and collectionPeriodStart != ''">
+                t.collection_period_start = #{collectionPeriodStart},
+            </if>
+            <if test="collectionPeriodEnd != null and collectionPeriodEnd != ''">
+                t.collection_period_end = #{collectionPeriodEnd},
+            </if>
+            <if test="receivableMoney != null and receivableMoney != ''">
+                t.receivable_money = #{receivableMoney},
+            </if>
+            <if test="collectionDate != null and collectionDate != ''">
+                t.collection_date = #{collectionDate},
+            </if>
+            <if test="collectionAmount != null and collectionAmount != ''">
+                t.collection_amount = #{collectionAmount},
+            </if>
+            <if test="specialReduction != null and specialReduction != ''">
+                t.special_reduction = #{specialReduction},
+            </if>
+            <if test="unpaidMoney != null and unpaidMoney != ''">
+                t.unpaid_money = #{unpaidMoney},
+            </if>
+            <if test="chargeType != null and chargeType != ''">
+                t.charge_type = #{chargeType},
+            </if>
+            <if test="invoiceReceiptNo != null and invoiceReceiptNo != ''">
+                t.invoice_receipt_no = #{invoiceReceiptNo},
+            </if>
+            <if test="whiteListArchiveNo != null and whiteListArchiveNo != ''">
+                t.white_list_archive_no = #{whiteListArchiveNo},
+            </if>
+        </trim>
         where 1=1
-        <if test="id !=null and id != ''">
-            and t.id= #{id}
-        </if>
-        <if test="contractId !=null and contractId != ''">
-            and t.contract_id= #{contractId}
-        </if>
-    </update>
-
-    <!-- 鏌ヨ鍚堝悓鏀舵鏄庣粏鏁伴噺 add by wuxw 2018-07-03 -->
-    <select id="queryContractCollectionDetailCount" parameterType="Map" resultType="Map">
-        select count(1) count
-        from contract_collection_detail t
-        where 1 =1
         <if test="id != null and id != ''">
             and t.id = #{id}
         </if>
         <if test="contractId != null and contractId != ''">
             and t.contract_id = #{contractId}
         </if>
-        <if test="contractIds !=null">
+    </update>
+
+    <!-- 鏌ヨ鍚堝悓鏀舵鏄庣粏鏁伴噺 -->
+    <select id="queryContractCollectionDetailCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from contract_collection_detail t
+        where 1=1
+        <if test="id != null and id != ''">
+            and t.id = #{id}
+        </if>
+        <if test="contractId != null and contractId != ''">
+            and t.contract_id = #{contractId}
+        </if>
+        <if test="contractIds != null">
             and t.contract_id in
-            <foreach collection="contractIds" item="item" index="index" open="(" close=")" separator=",">
+            <foreach collection="contractIds" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>
@@ -136,6 +182,17 @@
         <if test="unpaidMoney != null and unpaidMoney != ''">
             and t.unpaid_money = #{unpaidMoney}
         </if>
+        <if test="chargeType != null and chargeType != ''">
+            and t.charge_type = #{chargeType}
+        </if>
+        <if test="invoiceReceiptNo != null and invoiceReceiptNo != ''">
+            and t.invoice_receipt_no = #{invoiceReceiptNo}
+        </if>
+        <if test="whiteListArchiveNo != null and whiteListArchiveNo != ''">
+            and t.white_list_archive_no = #{whiteListArchiveNo}
+        </if>
     </select>
-
+    <delete id="deleteContractCollectionDetail" parameterType="map">
+        DELETE FROM contract_collection_detail WHERE id = #{id}
+    </delete>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0