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/BaseDataStatisticsServiceDaoImplMapper.xml | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/BaseDataStatisticsServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/BaseDataStatisticsServiceDaoImplMapper.xml
index 518d842..be27257 100644
--- a/java110-db/src/main/resources/mapper/report/BaseDataStatisticsServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/BaseDataStatisticsServiceDaoImplMapper.xml
@@ -114,10 +114,8 @@
from building_room t
inner join building_unit bu on t.unit_id = bu.unit_id and bu.status_cd = '0'
inner join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
- <if test="ownerId != null and ownerId != ''">
- inner join building_owner_room_rel borr on t.room_id = borr.room_id and borr.status_cd = '0'
- left join building_owner bo on borr.owner_id = bo.member_id and bo.status_cd = '0'
- </if>
+ left join building_owner_room_rel borr on t.room_id = borr.room_id and borr.status_cd = '0'
+ left join building_owner bo on borr.owner_id = bo.member_id and bo.status_cd = '0'
inner join pay_fee pf on t.room_id = pf.payer_obj_id and pf.payer_obj_type = '3333' and pf.status_cd = '0'
inner join pay_fee_detail pfd on pf.fee_id = pfd.fee_id and pfd.status_cd = '0'
where 1=1
@@ -217,11 +215,11 @@
<if test="link != null and link != ''">
and bo.link = #{link}
</if>
- order by t.create_time desc
group by t.fee_coefficient ,t.section,t.remark,t.user_id ,
t.room_id ,t.layer,t.built_up_area,t.room_num,t.unit_id,t.b_id,t.apartment,t.state,t.community_id,t.room_type,
t.room_sub_type,t.room_rent,t.room_area,t.room_rent,t.room_area,
f.floor_num ,bu.unit_num ,bo.name ,bo.owner_id ,bo.link
+ order by t.create_time desc
) a
<if test="page != -1 and page != null">
limit #{page},#{row}
@@ -236,10 +234,8 @@
from building_room t
inner join building_unit bu on t.unit_id = bu.unit_id and bu.status_cd = '0'
inner join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
- <if test="ownerId != null and ownerId != ''">
- inner join building_owner_room_rel borr on t.room_id = borr.room_id and borr.status_cd = '0'
- left join building_owner bo on borr.owner_id = bo.member_id and bo.status_cd = '0'
- </if>
+ left join building_owner_room_rel borr on t.room_id = borr.room_id and borr.status_cd = '0'
+ left join building_owner bo on borr.owner_id = bo.member_id and bo.status_cd = '0'
inner join report_owe_fee rof on t.room_id = rof.payer_obj_id and rof.payer_obj_type = '3333'
where 1=1
and rof.amount_owed > 0
@@ -277,6 +273,7 @@
<if test="link != null and link != ''">
and bo.link = #{link}
</if>
+ group by t.room_id
) a
</select>
@@ -330,11 +327,11 @@
<if test="link != null and link != ''">
and bo.link = #{link}
</if>
- order by t.create_time desc
group by t.fee_coefficient ,t.section,t.remark,t.user_id ,
t.room_id ,t.layer,t.built_up_area,t.room_num,t.unit_id,t.b_id,t.apartment,t.state,t.community_id,t.room_type,
t.room_sub_type,t.room_rent,t.room_area,t.room_rent,t.room_area,
f.floor_num ,bu.unit_num ,bo.name ,bo.owner_id ,bo.link
+ order by t.create_time desc
) a
<if test="page != -1 and page != null">
limit #{page},#{row}
--
Gitblit v1.8.0