From deaac9ebe189b9739197d59440f04bd7b8a6cabd Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 26 七月 2023 09:55:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml
index de0f7d8..9fdfdf4 100755
--- a/java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml
@@ -345,22 +345,40 @@
left join c_business cb on t.b_id = cb.b_id
left join c_orders co on cb.o_id = co.o_id
left join u_user uu on co.user_id = uu.user_id
+ <if test="deleteFlag != null and deleteFlag != ''">
+ inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '1' and pf.b_id = t.b_id
+ </if>
where 1=1
+ <if test="feeId != null and feeId != ''">
and t.fee_id = #{feeId}
+ </if>
+ <if test="deleteFlag != null and deleteFlag != ''">
+ and t.operate = 'DEL'
+ </if>
and t.community_id = #{communityId}
</select>
<select id="queryHisFees" parameterType="Map" resultType="Map">
select t.operate,t.start_time startTime,t.end_time endTime,t.create_time createTime,pfc.fee_name feeName,
t.amount,
- uu.`name` userName
+ uu.`name` userName,pfa.`value` payerObjName,pfa1.value ownerName
from business_pay_fee t
- left join pay_fee_config pfc on t.config_id = pfc.config_id and pfc.status_cd = '0'
+ left join pay_fee_config pfc on t.config_id = pfc.config_id
left join c_business cb on t.b_id = cb.b_id
left join c_orders co on cb.o_id = co.o_id
left join u_user uu on co.user_id = uu.user_id
+ left join pay_fee_attrs pfa on pfa.fee_id = t.fee_id and pfa.spec_cd = '390012'
+ left join pay_fee_attrs pfa1 on pfa1.fee_id = t.fee_id and pfa1.spec_cd = '390008'
+ <if test="deleteFlag != null and deleteFlag != ''">
+ inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '1' and pf.b_id = t.b_id
+ </if>
where 1=1
- and t.fee_id = #{feeId}
+ <if test="feeId != null and feeId != ''">
+ and t.fee_id = #{feeId}
+ </if>
+ <if test="deleteFlag != null and deleteFlag != ''">
+ and t.operate = 'DEL'
+ </if>
and t.community_id = #{communityId}
order by t.create_time desc,t.operate
<if test="page != -1 and page != null ">
--
Gitblit v1.8.0