From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +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, 28 insertions(+), 5 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml
index 6b8f942..91273e3 100644
--- a/java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml
@@ -91,7 +91,7 @@
<if test="payerObjId !=null and payerObjId != ''">
and t.payer_obj_id= #{payerObjId}
</if>
- order by t.payer_obj_name
+ order by t.payer_obj_id
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -157,7 +157,7 @@
<!-- 淇敼娆犺垂缁熻淇℃伅 add by wuxw 2018-07-03 -->
- <update id="deleteReportOweFeeInfo" parameterType="Map">
+ <delete id="deleteReportOweFeeInfo" parameterType="Map">
delete from report_owe_fee
where 1=1
<if test="oweId !=null and oweId != ''">
@@ -169,7 +169,7 @@
<if test="communityId !=null and communityId != ''">
and community_id= #{communityId}
</if>
- </update>
+ </delete>
<!-- 鏌ヨ娆犺垂缁熻鏁伴噺 add by wuxw 2018-07-03 -->
@@ -349,10 +349,10 @@
</if>
</select>
- <!-- 鏌ヨ娆犺垂缁熻淇℃伅 add by wuxw 2018-07-03 -->
+ <!-- 鏌ヨ娆犺垂缁熻淇℃伅 add by wuxw 2018-07-03 t.owner_tel,t.owner_tel ownerTel,-->
<select id="queryReportAllOweFeesByRoom" parameterType="Map" resultType="Map">
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
+ deadlineTime,t.update_time,t.update_time updateTime,t.owe_id,t.owe_id
oweId,t.fee_id,t.fee_id feeId,t.amount_owed,t.amount_owed amountOwed,t.payer_obj_name,t.payer_obj_name
payerObjName,t.config_id,t.config_id configId,t.fee_name,t.fee_name
feeName,t.end_time,t.end_time endTime,t.community_id,t.community_id
@@ -776,4 +776,27 @@
and community_id = #{communityId}
</update>
+
+ <select id="queryOweFeesByOwnerIds" parameterType="Map" resultType="Map">
+ select t.owner_id ownerId,SUM(t.amount_owed) oweFee
+ from report_owe_fee t
+ where t.community_id = #{communityId}
+ and t.owner_id in
+ <foreach collection="ownerIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ group by t.owner_id
+ </select>
+ <select id="queryOweFeesByRoomIds" parameterType="Map" resultType="Map">
+ select t.payer_obj_id roomId,SUM(t.amount_owed) oweFee
+ from report_owe_fee t
+ where t.community_id = #{communityId}
+ and t.payer_obj_type = '3333'
+ and t.payer_obj_id in
+ <foreach collection="roomIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ group by t.payer_obj_id
+ </select>
+
</mapper>
--
Gitblit v1.8.0