From 705923fdc6e615a0435c85d3d60eab0180b79a68 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 03 一月 2021 00:44:17 +0800
Subject: [PATCH] 优化 SQL语句错误问题
---
java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml | 109 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 90 insertions(+), 19 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
index 8a50bf8..2c56145 100644
--- a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
@@ -275,7 +275,8 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryReportFeeSummary" parameterType="Map" resultType="Map">
- select t.fee_year feeYear,t.fee_month feeMonth,SUM(t.receivable_amount) receivableAmount,SUM(t.received_amount)
+ select t.fee_year feeYear,t.fee_month feeMonth,t.create_time createTime,SUM(t.receivable_amount)
+ receivableAmount,SUM(t.received_amount)
receivedAmount,SUM(t.owe_amount) oweAmount
from report_fee_month_statistics t
left join building_room br on t.obj_id = br.room_id and t.obj_type = '3333' and br.status_cd = '0'
@@ -381,7 +382,8 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryReportFloorUnitFeeSummary" parameterType="Map" resultType="Map">
- select t.fee_year feeYear,t.fee_month feeMonth, f.floor_num floorNum, bu.unit_num unitNum,
+ select t.fee_year feeYear,t.fee_month feeMonth, f.floor_num floorNum, bu.unit_num unitNum,t.create_time
+ createTime,
SUM(t.receivable_amount) receivableAmount,SUM(t.received_amount) receivedAmount,SUM(t.owe_amount) oweAmount
from report_fee_month_statistics t
INNER JOIN building_room br on t.obj_id = br.room_id and br.status_cd = '0'
@@ -436,12 +438,14 @@
<select id="queryFeeBreakdownCount" parameterType="Map" resultType="Map">
select count(1) count
from (
- select t.fee_name,pfc.start_time
+ select t.fee_name feeName,td.name feeTypeCd,pfc.fee_type_cd,pfc.start_time feeCreateTime,t.create_time createTime,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'
left join building_room br on t.obj_id = br.room_id and t.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 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"
where t.status_cd = '0'
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
@@ -465,13 +469,16 @@
and t.fee_id= #{feeId}
</if>
<if test="configId !=null and configId != ''">
- and t.config_id= #{configId}
+ and pfc.config_id= #{configId}
</if>
<if test="objId !=null and objId != ''">
and t.obj_id= #{objId}
</if>
<if test="feeName !=null and feeName != ''">
and t.fee_name= #{feeName}
+ </if>
+ <if test="feeTypeCd != null and feeTypeCd != ''">
+ and pfc.fee_type_cd = #{feeTypeCd}
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -488,13 +495,14 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryFeeBreakdown" parameterType="Map" resultType="Map">
- select t.fee_name feeName,pfc.start_time feeCreateTime,SUM(t.receivable_amount)
+ select t.fee_name feeName,td.name feeTypeCd,pfc.fee_type_cd,pfc.start_time feeCreateTime,t.create_time createTime,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'
left join building_room br on t.obj_id = br.room_id and t.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 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"
where t.status_cd = '0'
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
@@ -518,13 +526,16 @@
and t.fee_id= #{feeId}
</if>
<if test="configId !=null and configId != ''">
- and t.config_id= #{configId}
+ and pfc.config_id= #{configId}
</if>
<if test="objId !=null and objId != ''">
and t.obj_id= #{objId}
</if>
<if test="feeName !=null and feeName != ''">
and t.fee_name= #{feeName}
+ </if>
+ <if test="feeTypeCd != null and feeTypeCd != ''">
+ and pfc.fee_type_cd = #{feeTypeCd}
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -597,8 +608,8 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryFeeDetail" parameterType="Map" resultType="Map">
select t.obj_name objName,t.fee_name feeName,t.fee_create_time feeCreateTime,t.deadline_time
- deadlineTime,SUM(t.receivable_amount) receivableAmount,SUM(t.received_amount) receivedAmount,
- SUM(t.owe_amount) oweAmount
+ deadlineTime,t.create_time createTime,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'
left join building_room br on t.obj_id = br.room_id and t.obj_type = '3333' and br.status_cd = '0'
@@ -756,7 +767,8 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryOweFeeDetail" parameterType="Map" resultType="Map">
- select t.obj_name objName,t.fee_name feeName,t.fee_create_time feeCreateTime,SUM(t.receivable_amount)
+ select t.obj_name objName,t.fee_name feeName,t.fee_create_time feeCreateTime,t.create_time
+ createTime,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'
@@ -815,7 +827,7 @@
from (
select pfc.fee_name feeName,f.floor_num floorNum,bu.unit_num unitNum,br.room_num roomNum,oc.car_num carNum,
pf.payer_obj_type payerObjType,t.start_time startTime,t.end_time endTime,t.create_time createTime,
- t.receivable_amount receivableAmount,t.received_amount receivedAmount
+ t.receivable_amount receivableAmount,t.received_amount receivedAmount,d.name
from pay_fee_detail t
INNER JOIN pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
inner join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'
@@ -823,6 +835,8 @@
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'
+ 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'
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
@@ -846,7 +860,7 @@
and t.fee_id= #{feeId}
</if>
<if test="configId !=null and configId != ''">
- and t.config_id= #{configId}
+ and pfc.config_id= #{configId}
</if>
<if test="objId !=null and objId != ''">
and t.obj_id= #{objId}
@@ -856,6 +870,9 @@
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
+ </if>
+ <if test="primeRate != null and primeRate != ''">
+ and t.prime_rate = #{primeRate}
</if>
<if test="startTime !=null">
and t.create_time >= #{startTime}
@@ -871,7 +888,7 @@
select pfc.fee_name feeName,f.floor_num floorNum,bu.unit_num unitNum,br.room_num roomNum,oc.car_num carNum,
pf.payer_obj_type payerObjType,t.start_time startTime,t.end_time endTime,t.create_time createTime,
t.receivable_amount receivableAmount,t.received_amount receivedAmount,pfa.`value`
- importFeeName,t.prime_rate,d.name
+ importFeeName,t.prime_rate,d.name primeRate
from pay_fee_detail t
INNER JOIN pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
inner join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'
@@ -905,7 +922,7 @@
and t.fee_id= #{feeId}
</if>
<if test="configId !=null and configId != ''">
- and t.config_id= #{configId}
+ and pfc.config_id= #{configId}
</if>
<if test="objId !=null and objId != ''">
and t.obj_id= #{objId}
@@ -916,6 +933,9 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
+ <if test="primeRate != null and primeRate != ''">
+ and t.prime_rate = #{primeRate}
+ </if>
<if test="startTime !=null">
and t.create_time >= #{startTime}
</if>
@@ -925,6 +945,61 @@
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
+ </if>
+ </select>
+
+ <select id="queryAllPayFeeDetail" parameterType="Map" resultType="Map">
+ select SUM(t.receivable_amount) allReceivableAmount,SUM(t.received_amount) allReceivedAmount
+ from pay_fee_detail t
+ INNER JOIN pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
+ inner join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'
+ 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'
+ left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002'
+ where t.status_cd = '0'
+ <if test="roomNum !=null and roomNum != ''">
+ and br.room_num= #{roomNum}
+ </if>
+ <if test="unitId !=null and unitId != ''">
+ and bu.unit_id= #{unitId}
+ </if>
+ <if test="floorId !=null and floorId != ''">
+ and f.floor_id = #{floorId}
+ </if>
+ <if test="objName !=null and objName != ''">
+ and t.obj_name= #{objName}
+ </if>
+ <if test="feeYear !=null and feeYear != ''">
+ and t.fee_year= #{feeYear}
+ </if>
+ <if test="feeMonth !=null and feeMonth != ''">
+ and t.fee_month= #{feeMonth}
+ </if>
+ <if test="feeId !=null and feeId != ''">
+ and t.fee_id= #{feeId}
+ </if>
+ <if test="configId !=null and configId != ''">
+ and pfc.config_id= #{configId}
+ </if>
+ <if test="objId !=null and objId != ''">
+ and t.obj_id= #{objId}
+ </if>
+ <if test="feeName !=null and feeName != ''">
+ and t.fee_name= #{feeName}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="primeRate != null and primeRate != ''">
+ and t.prime_rate = #{primeRate}
+ </if>
+ <if test="startTime !=null">
+ and t.create_time >= #{startTime}
+ </if>
+ <if test="endTime !=null">
+ and t.create_time <= #{endTime}
</if>
</select>
@@ -1169,6 +1244,8 @@
and t.bill_type = td3.status_cd
and td3.table_name = 'pay_fee_config'
and td3.table_columns = 'bill_type'
+ and t.is_default = 'F'
+ and t.status_cd = '0'
<if test="feeTypeCd !=null and feeTypeCd != ''">
and t.fee_type_cd= #{feeTypeCd}
</if>
@@ -1178,14 +1255,8 @@
<if test="additionalAmount !=null and additionalAmount != ''">
and t.additional_amount= #{additionalAmount}
</if>
- <if test="statusCd !=null and statusCd != ''">
- and t.status_cd= #{statusCd}
- </if>
<if test="squarePrice !=null and squarePrice != ''">
and t.square_price= #{squarePrice}
- </if>
- <if test="isDefault !=null and isDefault != ''">
- and t.is_default= #{isDefault}
</if>
<if test="configId !=null and configId != ''">
and t.config_id= #{configId}
--
Gitblit v1.8.0