From 4dbf61c9189796ec46d39ac4b839cfc064e70411 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 12 八月 2021 16:11:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/fee/FeeCollectionDetailServiceDaoImplMapper.xml |  309 +++++++++++++++++++++++++-------------------------
 1 files changed, 155 insertions(+), 154 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/fee/FeeCollectionDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeCollectionDetailServiceDaoImplMapper.xml
index bc628ad..8002d90 100644
--- a/java110-db/src/main/resources/mapper/fee/FeeCollectionDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeCollectionDetailServiceDaoImplMapper.xml
@@ -5,9 +5,6 @@
 <mapper namespace="feeCollectionDetailServiceDaoImpl">
 
 
-
-
-
     <!-- 淇濆瓨鍌即鍗曚俊鎭� add by wuxw 2018-07-03 -->
     <insert id="saveFeeCollectionDetailInfo" parameterType="Map">
         insert into fee_collection_detail(
@@ -18,170 +15,174 @@
     </insert>
 
 
-
     <!-- 鏌ヨ鍌即鍗曚俊鎭� add by wuxw 2018-07-03 -->
     <select id="getFeeCollectionDetailInfo" parameterType="Map" resultType="Map">
-        select  t.order_id,t.order_id orderId,t.detail_id,t.detail_id detailId,t.status_cd,t.status_cd statusCd,t.owner_id,t.owner_id ownerId,t.collection_name,t.collection_name collectionName,t.payer_obj_name,t.payer_obj_name payerObjName,t.owner_name,t.owner_name ownerName,t.fee_name,t.fee_name feeName,t.owe_amount,t.owe_amount oweAmount,t.state,t.community_id,t.community_id communityId,t.payer_obj_type,t.payer_obj_type payerObjType,t.collection_way,t.collection_way collectionWay,t.remarks,t.payer_obj_id,t.payer_obj_id payerObjId 
-from fee_collection_detail t 
-where 1 =1 
-<if test="orderId !=null and orderId != ''">
-   and t.order_id= #{orderId}
-</if> 
-<if test="detailId !=null and detailId != ''">
-   and t.detail_id= #{detailId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-   and t.owner_id= #{ownerId}
-</if> 
-<if test="collectionName !=null and collectionName != ''">
-   and t.collection_name= #{collectionName}
-</if> 
-<if test="payerObjName !=null and payerObjName != ''">
-   and t.payer_obj_name= #{payerObjName}
-</if> 
-<if test="ownerName !=null and ownerName != ''">
-   and t.owner_name= #{ownerName}
-</if> 
-<if test="feeName !=null and feeName != ''">
-   and t.fee_name= #{feeName}
-</if> 
-<if test="oweAmount !=null and oweAmount != ''">
-   and t.owe_amount= #{oweAmount}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="payerObjType !=null and payerObjType != ''">
-   and t.payer_obj_type= #{payerObjType}
-</if> 
-<if test="collectionWay !=null and collectionWay != ''">
-   and t.collection_way= #{collectionWay}
-</if> 
-<if test="remarks !=null and remarks != ''">
-   and t.remarks= #{remarks}
-</if> 
-<if test="payerObjId !=null and payerObjId != ''">
-   and t.payer_obj_id= #{payerObjId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.order_id,t.order_id orderId,t.detail_id,t.detail_id detailId,t.status_cd,t.status_cd statusCd,
+        t.owner_id,t.owner_id ownerId,t.collection_name,t.collection_name
+        collectionName,t.payer_obj_name,t.payer_obj_name payerObjName,
+        t.owner_name,t.owner_name ownerName,t.fee_name,t.fee_name feeName,t.owe_amount,t.owe_amount oweAmount,t.state,
+        t.community_id,t.community_id communityId,t.payer_obj_type,t.payer_obj_type
+        payerObjType,t.collection_way,t.collection_way collectionWay,
+        t.remarks,t.payer_obj_id,t.payer_obj_id payerObjId,t.create_time,t.create_time createTime
+        from fee_collection_detail t
+        where 1 =1
+        <if test="orderId !=null and orderId != ''">
+            and t.order_id= #{orderId}
+        </if>
+        <if test="detailId !=null and detailId != ''">
+            and t.detail_id= #{detailId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            and t.owner_id= #{ownerId}
+        </if>
+        <if test="collectionName !=null and collectionName != ''">
+            and t.collection_name= #{collectionName}
+        </if>
+        <if test="payerObjName !=null and payerObjName != ''">
+            and t.payer_obj_name= #{payerObjName}
+        </if>
+        <if test="ownerName !=null and ownerName != ''">
+            and t.owner_name= #{ownerName}
+        </if>
+        <if test="feeName !=null and feeName != ''">
+            and t.fee_name= #{feeName}
+        </if>
+        <if test="oweAmount !=null and oweAmount != ''">
+            and t.owe_amount= #{oweAmount}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="payerObjType !=null and payerObjType != ''">
+            and t.payer_obj_type= #{payerObjType}
+        </if>
+        <if test="collectionWay !=null and collectionWay != ''">
+            and t.collection_way= #{collectionWay}
+        </if>
+        <if test="remarks !=null and remarks != ''">
+            and t.remarks= #{remarks}
+        </if>
+        <if test="payerObjId !=null and payerObjId != ''">
+            and t.payer_obj_id= #{payerObjId}
+        </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="updateFeeCollectionDetailInfo" parameterType="Map">
-        update  fee_collection_detail t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="orderId !=null and orderId != ''">
-, t.order_id= #{orderId}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-, t.owner_id= #{ownerId}
-</if> 
-<if test="collectionName !=null and collectionName != ''">
-, t.collection_name= #{collectionName}
-</if> 
-<if test="payerObjName !=null and payerObjName != ''">
-, t.payer_obj_name= #{payerObjName}
-</if> 
-<if test="ownerName !=null and ownerName != ''">
-, t.owner_name= #{ownerName}
-</if> 
-<if test="feeName !=null and feeName != ''">
-, t.fee_name= #{feeName}
-</if> 
-<if test="oweAmount !=null and oweAmount != ''">
-, t.owe_amount= #{oweAmount}
-</if> 
-<if test="state !=null and state != ''">
-, t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="payerObjType !=null and payerObjType != ''">
-, t.payer_obj_type= #{payerObjType}
-</if> 
-<if test="collectionWay !=null and collectionWay != ''">
-, t.collection_way= #{collectionWay}
-</if> 
-<if test="remarks !=null and remarks != ''">
-, t.remarks= #{remarks}
-</if> 
-<if test="payerObjId !=null and payerObjId != ''">
-, t.payer_obj_id= #{payerObjId}
-</if> 
- where 1=1 <if test="detailId !=null and detailId != ''">
-and t.detail_id= #{detailId}
-</if> 
+        update fee_collection_detail t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="orderId !=null and orderId != ''">
+            , t.order_id= #{orderId}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            , t.owner_id= #{ownerId}
+        </if>
+        <if test="collectionName !=null and collectionName != ''">
+            , t.collection_name= #{collectionName}
+        </if>
+        <if test="payerObjName !=null and payerObjName != ''">
+            , t.payer_obj_name= #{payerObjName}
+        </if>
+        <if test="ownerName !=null and ownerName != ''">
+            , t.owner_name= #{ownerName}
+        </if>
+        <if test="feeName !=null and feeName != ''">
+            , t.fee_name= #{feeName}
+        </if>
+        <if test="oweAmount !=null and oweAmount != ''">
+            , t.owe_amount= #{oweAmount}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="payerObjType !=null and payerObjType != ''">
+            , t.payer_obj_type= #{payerObjType}
+        </if>
+        <if test="collectionWay !=null and collectionWay != ''">
+            , t.collection_way= #{collectionWay}
+        </if>
+        <if test="remarks !=null and remarks != ''">
+            , t.remarks= #{remarks}
+        </if>
+        <if test="payerObjId !=null and payerObjId != ''">
+            , t.payer_obj_id= #{payerObjId}
+        </if>
+        where 1=1
+        <if test="detailId !=null and detailId != ''">
+            and t.detail_id= #{detailId}
+        </if>
 
     </update>
 
     <!-- 鏌ヨ鍌即鍗曟暟閲� add by wuxw 2018-07-03 -->
-     <select id="queryFeeCollectionDetailsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from fee_collection_detail t 
-where 1 =1 
-<if test="orderId !=null and orderId != ''">
-   and t.order_id= #{orderId}
-</if> 
-<if test="detailId !=null and detailId != ''">
-   and t.detail_id= #{detailId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-   and t.owner_id= #{ownerId}
-</if> 
-<if test="collectionName !=null and collectionName != ''">
-   and t.collection_name= #{collectionName}
-</if> 
-<if test="payerObjName !=null and payerObjName != ''">
-   and t.payer_obj_name= #{payerObjName}
-</if> 
-<if test="ownerName !=null and ownerName != ''">
-   and t.owner_name= #{ownerName}
-</if> 
-<if test="feeName !=null and feeName != ''">
-   and t.fee_name= #{feeName}
-</if> 
-<if test="oweAmount !=null and oweAmount != ''">
-   and t.owe_amount= #{oweAmount}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="payerObjType !=null and payerObjType != ''">
-   and t.payer_obj_type= #{payerObjType}
-</if> 
-<if test="collectionWay !=null and collectionWay != ''">
-   and t.collection_way= #{collectionWay}
-</if> 
-<if test="remarks !=null and remarks != ''">
-   and t.remarks= #{remarks}
-</if> 
-<if test="payerObjId !=null and payerObjId != ''">
-   and t.payer_obj_id= #{payerObjId}
-</if> 
+    <select id="queryFeeCollectionDetailsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from fee_collection_detail t
+        where 1 =1
+        <if test="orderId !=null and orderId != ''">
+            and t.order_id= #{orderId}
+        </if>
+        <if test="detailId !=null and detailId != ''">
+            and t.detail_id= #{detailId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            and t.owner_id= #{ownerId}
+        </if>
+        <if test="collectionName !=null and collectionName != ''">
+            and t.collection_name= #{collectionName}
+        </if>
+        <if test="payerObjName !=null and payerObjName != ''">
+            and t.payer_obj_name= #{payerObjName}
+        </if>
+        <if test="ownerName !=null and ownerName != ''">
+            and t.owner_name= #{ownerName}
+        </if>
+        <if test="feeName !=null and feeName != ''">
+            and t.fee_name= #{feeName}
+        </if>
+        <if test="oweAmount !=null and oweAmount != ''">
+            and t.owe_amount= #{oweAmount}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="payerObjType !=null and payerObjType != ''">
+            and t.payer_obj_type= #{payerObjType}
+        </if>
+        <if test="collectionWay !=null and collectionWay != ''">
+            and t.collection_way= #{collectionWay}
+        </if>
+        <if test="remarks !=null and remarks != ''">
+            and t.remarks= #{remarks}
+        </if>
+        <if test="payerObjId !=null and payerObjId != ''">
+            and t.payer_obj_id= #{payerObjId}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

--
Gitblit v1.8.0