From 0a38562076c5a68b8cfb6ffd634ede1164b1fbf0 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 03 七月 2021 09:57:52 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml
index cfe851e..d62f1f9 100644
--- a/java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml
@@ -75,7 +75,7 @@
<if test="payerObjId !=null and payerObjId != ''">
and t.payer_obj_id= #{payerObjId}
</if>
- order by t.create_time desc
+ order by t.payer_obj_name
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -85,11 +85,8 @@
<!-- 淇敼娆犺垂缁熻淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateReportOweFeeInfo" parameterType="Map">
- update report_owe_fee t set
+ update report_owe_fee t
<set>
- <if test="newBId != null and newBId != ''">
- t.b_id = #{newBId},
- </if>
<if test="configName !=null and configName != ''">
t.config_name= #{configName},
</if>
@@ -126,9 +123,7 @@
<if test="endTime !=null and endTime != ''">
t.end_time= #{endTime},
</if>
- <if test="communityId !=null and communityId != ''">
- t.community_id= #{communityId},
- </if>
+
<if test="payerObjType !=null and payerObjType != ''">
t.payer_obj_type= #{payerObjType},
</if>
@@ -137,10 +132,26 @@
</if>
</set>
where 1=1
- <if test="oweId !=null and oweId != ''">
and t.owe_id= #{oweId}
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
</if>
+ </update>
+
+ <!-- 淇敼娆犺垂缁熻淇℃伅 add by wuxw 2018-07-03 -->
+ <update id="deleteReportOweFeeInfo" parameterType="Map">
+ delete from report_owe_fee
+ where 1=1
+ <if test="oweId !=null and oweId != ''">
+ and owe_id= #{oweId}
+ </if>
+ <if test="feeId !=null and feeId != ''">
+ and fee_id = #{feeId}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and community_id= #{communityId}
+ </if>
</update>
<!-- 鏌ヨ娆犺垂缁熻鏁伴噺 add by wuxw 2018-07-03 -->
@@ -208,7 +219,7 @@
<!-- 鏌ヨ娆犺垂缁熻淇℃伅 add by wuxw 2018-07-03 -->
<select id="queryReportAllOweFees" parameterType="Map" resultType="Map">
- select select t.config_name,t.config_name configName,t.deadline_time,t.deadline_time
+ select t.config_name,t.config_name configName,t.deadline_time,t.deadline_time
deadlineTime,t.owner_tel,t.owner_tel ownerTel,t.update_time,t.update_time updateTime,t.owe_id,t.owe_id
oweId,t.owner_id,t.owner_id ownerId,t.fee_id,t.fee_id
feeId,t.amount_owed,t.amount_owed amountOwed,t.payer_obj_name,t.payer_obj_name
@@ -278,7 +289,7 @@
#{item}
</foreach>
</if>
- order by t.create_time desc
+ order by t.payer_obj_name
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
--
Gitblit v1.8.0