From cc4aa9d45d7a2209023817ee72bd9a998470aedb Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期日, 08 八月 2021 00:11:59 +0800
Subject: [PATCH] 优化代码
---
java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml | 66 +++++++++++++++++----------------
1 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
index 54f2d53..ea77869 100755
--- a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
@@ -283,7 +283,6 @@
left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.community_id = t.community_id and pf.status_cd = '0'
-
where t.status_cd = '0'
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
@@ -454,8 +453,7 @@
left join t_dict td on pfc.fee_type_cd = td.status_cd and td.table_name='pay_fee_config' and
td.table_columns='fee_type_cd'
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.community_id = t.community_id and pf.status_cd = '0'
-
- where t.status_cd = '0'
+ where t.status_cd = '0' and t.receivable_amount >= 0 and t.received_amount >= 0 and t.owe_amount >= 0
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
</if>
@@ -493,10 +491,10 @@
and t.community_id= #{communityId}
</if>
<if test="startTime !=null">
- and t.create_time >= #{startTime}
+ and pfc.start_time >= #{startTime}
</if>
<if test="endTime !=null">
- and t.create_time <= #{endTime}
+ and pfc.start_time <= #{endTime}
</if>
group by t.config_id,t.fee_name,pfc.start_time
) t
@@ -504,8 +502,8 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryFeeBreakdown" parameterType="Map" resultType="Map">
- select t.fee_name feeName,td.name feeTypeCd,pfc.fee_type_cd,pfc.start_time feeCreateTime,t.create_time
- createTime,SUM(t.receivable_amount)
+ select t.fee_name feeName,td.name feeTypeCd,pfc.fee_type_cd,pfc.start_time feeStartTime,pfc.end_time
+ feeEndTime,SUM(t.receivable_amount)
receivableAmount,SUM(t.received_amount) receivedAmount,SUM(t.owe_amount) oweAmount
from report_fee_month_statistics t
inner join pay_fee_config pfc on t.config_id = pfc.config_id and pfc.status_cd = '0'
@@ -515,8 +513,7 @@
left join t_dict td on pfc.fee_type_cd = td.status_cd and td.table_name='pay_fee_config' and
td.table_columns='fee_type_cd'
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.community_id = t.community_id and pf.status_cd = '0'
-
- where t.status_cd = '0'
+ where t.status_cd = '0' and t.receivable_amount >= 0 and t.received_amount >= 0 and t.owe_amount >= 0
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
</if>
@@ -554,12 +551,13 @@
and t.community_id= #{communityId}
</if>
<if test="startTime !=null">
- and t.create_time >= #{startTime}
+ and pfc.start_time >= #{startTime}
</if>
<if test="endTime !=null">
- and t.create_time <= #{endTime}
+ and pfc.start_time <= #{endTime}
</if>
group by t.config_id,t.fee_name,pfc.start_time
+ order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -575,7 +573,6 @@
left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.community_id = t.community_id and pf.status_cd = '0'
-
where t.status_cd = '0'
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
@@ -631,7 +628,7 @@
left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.community_id = t.community_id and pf.status_cd = '0'
- where t.status_cd = '0'
+ where t.status_cd = '0' and t.receivable_amount >=0 and t.receivable_amount >= 0
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
</if>
@@ -794,7 +791,6 @@
left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.community_id = t.community_id and pf.status_cd = '0'
-
where t.status_cd = '0'
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
@@ -861,7 +857,7 @@
left join fee_discount_rule fdr on fd.rule_id = fdr.rule_id and fdr.status_cd = '0'
left join t_dict d on t.prime_rate = d.status_cd and d.table_name="pay_fee_detail" and
d.table_columns="prime_rate"
- where t.status_cd = '0'
+ where t.status_cd = '0' and t.state not in ('1100','1300')
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
</if>
@@ -920,16 +916,17 @@
left join building_room br on pf.payer_obj_id = br.room_id and pf.payer_obj_type = '3333' and br.status_cd = '0'
left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
- left join owner_car oc on pf.payer_obj_id = oc.car_id and oc.status_cd = '0' and oc.car_type_cd='1001'
+ left join owner_car oc on pf.payer_obj_id = oc.car_id and oc.status_cd = '0' and oc.car_type_cd='1001'
left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002'
left join pay_fee_attrs pfo on t.fee_id = pfo.fee_id and pfo.spec_cd = '390008'
left join pay_fee_detail_discount pfdd on t.detail_id = pfdd.detail_id and pfdd.status_cd = '0'
left join fee_discount fd on pfdd.discount_id = fd.discount_id and fd.status_cd = '0'
left join fee_discount_rule fdr on fd.rule_id = fdr.rule_id and fdr.status_cd = '0'
- left join t_dict d on t.prime_rate = d.status_cd and d.table_name="pay_fee_detail" and d.table_columns="prime_rate"
+ left join t_dict d on t.prime_rate = d.status_cd and d.table_name="pay_fee_detail" and
+ d.table_columns="prime_rate"
LEFT JOIN contract co on pf.payer_obj_id = co.contract_id and co.status_cd = '0' and pf.payer_obj_type='7777'
LEFT JOIN c_business cb on t.b_id = cb.b_id
- where t.status_cd = '0'
+ where t.status_cd = '0' and t.state not in ('1100','1300')
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
</if>
@@ -986,9 +983,9 @@
left join building_room br on pf.payer_obj_id = br.room_id and pf.payer_obj_type = '3333' and br.status_cd = '0'
left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
- left join owner_car oc on pf.payer_obj_id = oc.car_id and oc.status_cd = '0' and oc.car_type_cd='1001'
+ left join owner_car oc on pf.payer_obj_id = oc.car_id and oc.status_cd = '0' and oc.car_type_cd='1001'
left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002'
- where t.status_cd = '0'
+ where t.status_cd = '0' and t.state not in ('1100','1300')
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
</if>
@@ -1046,14 +1043,14 @@
left join building_room br on pf.payer_obj_id = br.room_id and pf.payer_obj_type = '3333' and br.status_cd = '0'
left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
- left join owner_car oc on pf.payer_obj_id = oc.car_id and oc.status_cd = '0' and oc.car_type_cd='1001'
+ left join owner_car oc on pf.payer_obj_id = oc.car_id and oc.status_cd = '0' and oc.car_type_cd='1001'
left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002'
left join pay_fee_detail_discount pfdd on t.detail_id = pfdd.detail_id and pfdd.status_cd = '0'
left join fee_discount fd on pfdd.discount_id = fd.discount_id and fd.status_cd = '0'
left join fee_discount_rule fdr on fd.rule_id = fdr.rule_id and fdr.status_cd = '0'
left join t_dict d on t.prime_rate = d.status_cd and d.table_name="pay_fee_detail" and
d.table_columns="prime_rate"
- where t.status_cd = '0'
+ where t.status_cd = '0' and t.state not in ('1100','1300')
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
</if>
@@ -1114,7 +1111,6 @@
left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.community_id = t.community_id and pf.status_cd = '0'
-
where t.status_cd = '0'
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
@@ -1228,7 +1224,8 @@
left join building_room br on t.payer_obj_id = br.room_id and t.payer_obj_type = '3333' and br.status_cd = '0'
left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
left join f_floor f on f.floor_id = bu.floor_id and f.status_cd = '0'
- left join owner_car oc on t.payer_obj_id = oc.car_id and t.payer_obj_type = '6666' and oc.status_cd = '0' and oc.car_type_cd='1001'
+ left join owner_car oc on t.payer_obj_id = oc.car_id and t.payer_obj_type = '6666' and oc.status_cd = '0' and
+ oc.car_type_cd='1001'
where t.state = '2008001'
and t.status_cd = '0'
<if test="communityId !=null and communityId != ''">
@@ -1252,7 +1249,8 @@
left join building_room br on t.payer_obj_id = br.room_id and t.payer_obj_type = '3333' and br.status_cd = '0'
left join building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
left join f_floor f on f.floor_id = bu.floor_id and f.status_cd = '0'
- left join owner_car oc on t.payer_obj_id = oc.car_id and t.payer_obj_type = '6666' and oc.status_cd = '0' and oc.car_type_cd='1001'
+ left join owner_car oc on t.payer_obj_id = oc.car_id and t.payer_obj_type = '6666' and oc.status_cd = '0' and
+ oc.car_type_cd='1001'
where t.state = '2008001'
and t.status_cd = '0'
<if test="communityId !=null and communityId != ''">
@@ -1465,9 +1463,11 @@
</select>
<select id="getRepairWithOutPage" parameterType="Map" resultType="Map">
- select r.staff_id staffId,r.staff_name staffName,r.state, t.name stateName, count(*) amount from r_repair_user r
+ select r.staff_id staffId,r.staff_name staffName,r.state, t.name stateName,u.score, count(*) amount from
+ r_repair_user r
left join t_dict t on t.table_name="r_repair_user" and t.table_columns="state" and t.status_cd=r.state
- where r.state != "10005" and r.status_cd = "0"
+ left join u_user u on u.user_id = r.staff_id and u.status_cd = '0'
+ where r.state != '10005' and r.status_cd = '0'
<if test="ruId != null and ruId != ''">
and r.ru_id = #{ruId}
</if>
@@ -1521,9 +1521,10 @@
</select>
<select id="queryRepairForStaff" parameterType="Map" resultType="Map">
- SELECT r.staff_id staffId,r.staff_name staffName FROM r_repair_user r
- WHERE r.state!='10005' AND
- r.repair_event!='payUser' AND r.repair_event!="startUser" AND r.staff_id != '-1'
+ SELECT r.staff_id staffId,r.staff_name staffName,r.state FROM r_repair_user r
+ WHERE r.state!='10005' AND r.state!='10009' AND r.state!='11000' AND
+ r.state!='12000' AND r.state != '10007' AND r.status_cd = '0' AND
+ r.repair_event != 'payUser' AND r.repair_event != 'startUser' AND r.staff_id != '-1'
<if test="communityId != null and communityId !=''">
and r.community_id = #{communityId}
</if>
@@ -1580,9 +1581,10 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryNoFeeRooms" parameterType="Map" resultType="Map">
- select f.floor_num floorNum,bu.unit_num unitNum,t.room_num roomNum,t.room_id roomId,bo.owner_id ownerId,bo.name ownerName,bo.link
+ select f.floor_num floorNum,bu.unit_num unitNum,t.room_num roomNum,t.room_id roomId,bo.owner_id ownerId,bo.name
+ ownerName,bo.link
from building_room t
- inner join building_unit bu on t.unit_id = bu.unit_id and bu.status_cd = '0'
+ 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'
left join building_owner_room_rel borr on borr.room_id = t.room_id and borr.status_cd ='0'
left join building_owner bo on borr.owner_id = bo.member_id and bo.status_cd = '0'
--
Gitblit v1.8.0