From 2b919980a8c70554a64cb3d03cc95679af4d817f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 03 七月 2023 00:22:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml | 983 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 790 insertions(+), 193 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
index 2aa6f6a..cd9b1d6 100755
--- a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
@@ -6,15 +6,18 @@
<!-- 淇濆瓨璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<insert id="saveReportFeeMonthStatisticsInfo" parameterType="Map">
- insert into report_fee_month_statistics(
- receivable_amount,statistics_id,update_time,remark,obj_name,received_amount,fee_year,fee_month,fee_id,config_id,
- obj_id,fee_name,owe_amount,community_id,fee_create_time,obj_type,deadline_time,cur_max_time,
- his_owe_amount,cur_receivable_amount,cur_received_amount, his_owe_received_amount,pre_received_amount
- ) values (
- #{receivableAmount},#{statisticsId},#{updateTime},#{remark},#{objName},#{receivedAmount},#{feeYear},#{feeMonth},
- #{feeId},#{configId},#{objId},#{feeName},#{oweAmount},#{communityId},#{feeCreateTime},#{objType},#{deadlineTime},#{curMaxTime},
- #{hisOweAmount},#{curReceivableAmount},#{curReceivedAmount},#{hisOweReceivedAmount},#{preReceivedAmount}
- )
+ insert into report_fee_month_statistics(receivable_amount, statistics_id, update_time, remark, obj_name,
+ received_amount, fee_year, fee_month, fee_id, config_id,
+ obj_id, fee_name, owe_amount, community_id, fee_create_time, obj_type,
+ deadline_time, cur_max_time,
+ his_owe_amount, cur_receivable_amount, cur_received_amount,
+ his_owe_received_amount, pre_received_amount, obj_name_num)
+ values (#{receivableAmount}, #{statisticsId}, #{updateTime}, #{remark}, #{objName}, #{receivedAmount},
+ #{feeYear}, #{feeMonth},
+ #{feeId}, #{configId}, #{objId}, #{feeName}, #{oweAmount}, #{communityId}, #{feeCreateTime}, #{objType},
+ #{deadlineTime}, #{curMaxTime},
+ #{hisOweAmount}, #{curReceivableAmount}, #{curReceivedAmount}, #{hisOweReceivedAmount},
+ #{preReceivedAmount}, #{objNameNum})
</insert>
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
@@ -27,7 +30,7 @@
oweAmount,t.community_id,t.community_id communityId,t.fee_create_time,t.fee_create_time
feeCreateTime,t.obj_type,t.obj_type objType,t.cur_max_time curMaxTime,
t.his_owe_amount hisOweAmount,t.cur_receivable_amount curReceivableAmount,t.cur_received_amount
- curReceivedAmount,
+ curReceivedAmount,t.obj_name_num,t.obj_name_num objNameNum,
t.his_owe_received_amount hisOweReceivedAmount,t.pre_received_amount preReceivedAmount
from report_fee_month_statistics t
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.community_id = t.community_id and pf.status_cd = '0'
@@ -49,6 +52,9 @@
</if>
<if test="objName !=null and objName != ''">
and t.obj_name= #{objName}
+ </if>
+ <if test="objNameNum != null and objNameNum != ''">
+ and t.obj_name_num = #{objNameNum}
</if>
<if test="receivedAmount !=null and receivedAmount != ''">
and t.received_amount= #{receivedAmount}
@@ -105,6 +111,7 @@
</if>
</update>
+
<!-- 淇敼璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<update id="updateReportFeeMonthStatisticsInfo" parameterType="Map">
update report_fee_month_statistics t set t.status_cd = #{statusCd}
@@ -125,6 +132,9 @@
</if>
<if test="objName !=null and objName != ''">
, t.obj_name= #{objName}
+ </if>
+ <if test="objNameNum != null and objNameNum != ''">
+ , t.obj_name_num= #{objNameNum}
</if>
<if test="receivedAmount !=null and receivedAmount != ''">
, t.received_amount= #{receivedAmount}
@@ -176,7 +186,6 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
-
</update>
<!-- 淇敼璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
@@ -195,7 +204,6 @@
<if test="configId !=null and configId != ''">
and t.config_id= #{configId}
</if>
-
</update>
@@ -222,6 +230,9 @@
</if>
<if test="objName !=null and objName != ''">
and t.obj_name= #{objName}
+ </if>
+ <if test="objNameNum != null and objNameNum != ''">
+ and t.obj_name_num= #{objNameNum}
</if>
<if test="receivedAmount !=null and receivedAmount != ''">
and t.received_amount= #{receivedAmount}
@@ -275,11 +286,20 @@
<if test="unitId !=null and unitId != ''">
and bu.unit_id= #{unitId}
</if>
+ <if test="unitIds !=null ">
+ and bu.unit_id in
+ <foreach collection="unitIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </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="objNameNum != null and objNameNum != ''">
+ and t.obj_name_num= #{objNameNum}
</if>
<if test="feeYear !=null and feeYear != ''">
and t.fee_year= #{feeYear}
@@ -293,7 +313,6 @@
<if test="configId !=null and configId != ''">
and t.config_id= #{configId}
</if>
-
<if test="configIds !=null">
and t.config_id in
<foreach collection="configIds" item="item" open="(" close=")" separator=",">
@@ -321,7 +340,7 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryReportFeeSummary" parameterType="Map" resultType="Map">
- select t.fee_year feeYear,t.fee_month feeMonth,t.create_time createTime
+ select t.fee_year feeYear,t.fee_month feeMonth,max(t.create_time) createTime
<if test="configIds !=null">
,t.config_id configId
</if>
@@ -342,11 +361,20 @@
<if test="unitId !=null and unitId != ''">
and bu.unit_id= #{unitId}
</if>
+ <if test="unitIds !=null ">
+ and bu.unit_id in
+ <foreach collection="unitIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </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="objNameNum != null and objNameNum != ''">
+ and t.obj_name_num= #{objNameNum}
</if>
<if test="feeYear !=null and feeYear != ''">
and t.fee_year= #{feeYear}
@@ -385,6 +413,144 @@
<if test="configIds !=null">
,t.config_id
</if>
+ order by CONVERT(t.fee_month,SIGNED),CONVERT(t.fee_year,SIGNED) desc
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
+ </select>
+
+ <select id="queryReportFeeSummaryDetailCount" parameterType="Map" resultType="Map">
+ select count(1) count
+ 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'
+ 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}
+ </if>
+ <if test="unitId !=null and unitId != ''">
+ and bu.unit_id= #{unitId}
+ </if>
+ <if test="unitIds !=null ">
+ and bu.unit_id in
+ <foreach collection="unitIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </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="objNameNum != null and objNameNum != ''">
+ and t.obj_name_num= #{objNameNum}
+ </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 t.config_id= #{configId}
+ </if>
+ <if test="configIds !=null">
+ and t.config_id in
+ <foreach collection="configIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </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="startTime !=null and startTime != ''">
+ and t.create_time >= #{startTime}
+ </if>
+ <if test="endTime !=null and endTime != ''">
+ and t.create_time <= #{endTime}
+ </if>
+ </select>
+
+ <!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
+ <select id="queryReportFeeSummaryDetail" parameterType="Map" resultType="Map">
+ select t.obj_name objName,t.fee_name feeName,t.fee_year feeYear,t.fee_month feeMonth,t.create_time createTime
+ ,t.config_id configId,t.obj_name_num objNameNum,t.his_owe_amount hisOweAmount,t.cur_receivable_amount
+ curReceivableAmount,t.cur_received_amount curReceivedAmount,t.his_owe_received_amount
+ hisOweReceivedAmount,t.pre_received_amount preReceivedAmount,
+ t.update_time updateTime,t.his_owe_amount+t.cur_receivable_amount
+ receivableAmount,t.cur_received_amount+t.his_owe_received_amount+t.pre_received_amount receivedAmount
+ 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'
+ 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}
+ </if>
+ <if test="unitId !=null and unitId != ''">
+ and bu.unit_id= #{unitId}
+ </if>
+ <if test="unitIds !=null ">
+ and bu.unit_id in
+ <foreach collection="unitIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </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="objNameNum != null and objNameNum != ''">
+ and t.obj_name_num= #{objNameNum}
+ </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 t.config_id= #{configId}
+ </if>
+ <if test="configIds !=null">
+ and t.config_id in
+ <foreach collection="configIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </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="startTime !=null and startTime != ''">
+ and t.create_time >= #{startTime}
+ </if>
+ <if test="endTime !=null and endTime != ''">
+ and t.create_time <= #{endTime}
+ </if>
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -407,11 +573,20 @@
<if test="unitId !=null and unitId != ''">
and bu.unit_id= #{unitId}
</if>
+ <if test="unitIds !=null ">
+ and bu.unit_id in
+ <foreach collection="unitIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </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="objNameNum != null and objNameNum != ''">
+ and t.obj_name_num= #{objNameNum}
</if>
<if test="feeYear !=null and feeYear != ''">
and t.fee_year= #{feeYear}
@@ -470,6 +645,9 @@
<if test="objName !=null and objName != ''">
and t.obj_name= #{objName}
</if>
+ <if test="objNameNum != null and objNameNum != ''">
+ and t.obj_name_num= #{objNameNum}
+ </if>
<if test="feeYear !=null and feeYear != ''">
and t.fee_year= #{feeYear}
</if>
@@ -524,7 +702,6 @@
inner join building_unit bu on br.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'
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}
@@ -537,6 +714,9 @@
</if>
<if test="objName !=null and objName != ''">
and t.obj_name= #{objName}
+ </if>
+ <if test="objNameNum != null and objNameNum != ''">
+ and t.obj_name_num= #{objNameNum}
</if>
<if test="feeYear !=null and feeYear != ''">
and t.fee_year= #{feeYear}
@@ -580,6 +760,143 @@
</if>
</select>
+ <select id="queryReportFloorUnitFeeSummaryDetailCount" parameterType="Map" resultType="Map">
+ select count(1) count
+ from report_fee_month_statistics t
+ INNER JOIN building_room br on t.obj_id = br.room_id and br.status_cd = '0'
+ inner join building_unit bu on br.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'
+ 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}
+ </if>
+ <if test="unitId !=null and unitId != ''">
+ and bu.unit_id= #{unitId}
+ </if>
+ <if test="unitNum !=null and unitNum != ''">
+ and bu.unit_num= #{unitNum}
+ </if>
+ <if test="floorId !=null and floorId != ''">
+ and f.floor_id = #{floorId}
+ </if>
+ <if test="floorNum !=null and floorNum != ''">
+ and f.floor_num = #{floorNum}
+ </if>
+ <if test="objName !=null and objName != ''">
+ and t.obj_name= #{objName}
+ </if>
+ <if test="objNameNum != null and objNameNum != ''">
+ and t.obj_name_num= #{objNameNum}
+ </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 t.config_id= #{configId}
+ </if>
+ <if test="configIds !=null">
+ and t.config_id in
+ <foreach collection="configIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </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="startTime !=null and startTime != ''">
+ and t.create_time >= #{startTime}
+ </if>
+ <if test="endTime !=null and endTime != ''">
+ and t.create_time <= #{endTime}
+ </if>
+ </select>
+
+ <!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
+ <select id="queryReportFloorUnitFeeSummaryDetail" parameterType="Map" resultType="Map">
+ select t.obj_name objName,t.fee_name feeName,t.fee_year feeYear,t.fee_month feeMonth,t.create_time createTime
+ ,t.config_id configId,t.obj_name_num objNameNum,t.his_owe_amount hisOweAmount,t.cur_receivable_amount
+ curReceivableAmount,t.cur_received_amount curReceivedAmount,t.his_owe_received_amount
+ hisOweReceivedAmount,t.pre_received_amount preReceivedAmount,
+ t.update_time updateTime,t.his_owe_amount+t.cur_receivable_amount receivableAmount,
+ t.cur_received_amount+t.his_owe_received_amount+t.pre_received_amount receivedAmount
+ from report_fee_month_statistics t
+ INNER JOIN building_room br on t.obj_id = br.room_id and br.status_cd = '0'
+ inner join building_unit bu on br.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'
+ 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}
+ </if>
+ <if test="unitId !=null and unitId != ''">
+ and bu.unit_id= #{unitId}
+ </if>
+ <if test="unitNum !=null and unitNum != ''">
+ and bu.unit_num= #{unitNum}
+ </if>
+ <if test="floorId !=null and floorId != ''">
+ and f.floor_id = #{floorId}
+ </if>
+ <if test="floorNum !=null and floorNum != ''">
+ and f.floor_num = #{floorNum}
+ </if>
+ <if test="objName !=null and objName != ''">
+ and t.obj_name= #{objName}
+ </if>
+ <if test="objNameNum != null and objNameNum != ''">
+ and t.obj_name_num= #{objNameNum}
+ </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 t.config_id= #{configId}
+ </if>
+ <if test="configIds !=null">
+ and t.config_id in
+ <foreach collection="configIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </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="startTime !=null and startTime != ''">
+ and t.create_time >= #{startTime}
+ </if>
+ <if test="endTime !=null and endTime != ''">
+ and t.create_time <= #{endTime}
+ </if>
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
+ </select>
+
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryReportFloorUnitFeeSummaryMajor" parameterType="Map" resultType="Map">
select
@@ -602,6 +919,9 @@
</if>
<if test="objName !=null and objName != ''">
and t.obj_name= #{objName}
+ </if>
+ <if test="objNameNum != null and objNameNum != ''">
+ and t.obj_name_num= #{objNameNum}
</if>
<if test="feeYear !=null and feeYear != ''">
and t.fee_year= #{feeYear}
@@ -661,6 +981,9 @@
<if test="objName !=null and objName != ''">
and t.obj_name= #{objName}
</if>
+ <if test="objNameNum != null and objNameNum != ''">
+ and t.obj_name_num= #{objNameNum}
+ </if>
<if test="feeYear !=null and feeYear != ''">
and t.fee_year= #{feeYear}
</if>
@@ -692,10 +1015,9 @@
and pfc.start_time <= #{endTime}
</if>
<if test="yearMonth !=null and yearMonth != ''">
- and concat(t.fee_year,t.fee_month) = #{yearMonth}
+ and concat(t.fee_year,lpad(t.fee_month,2,0)) = #{yearMonth}
</if>
-
- group by t.config_id,t.fee_name,pfc.start_time
+ group by t.fee_name ,td.name ,pfc.fee_type_cd,pfc.start_time ,t.create_time
) t
</select>
@@ -703,7 +1025,7 @@
and t.receivable_amount >= 0 and t.received_amount >= 0 and t.owe_amount >= 0
-->
<select id="queryFeeBreakdown" parameterType="Map" resultType="Map">
- select t.fee_name feeName,td.name feeTypeCd,pfc.fee_type_cd,SUM(t.his_owe_amount)
+ select t.fee_name feeName,td.name feeTypeCd,pfc.fee_type_cd,t.config_id configId,SUM(t.his_owe_amount)
hisOweAmount,SUM(t.cur_receivable_amount) curReceivableAmount,
SUM(t.cur_received_amount) curReceivedAmount,SUM(t.his_owe_received_amount)
hisOweReceivedAmount,SUM(t.pre_received_amount) preReceivedAmount,
@@ -731,6 +1053,9 @@
<if test="objName !=null and objName != ''">
and t.obj_name= #{objName}
</if>
+ <if test="objNameNum != null and objNameNum != ''">
+ and t.obj_name_num= #{objNameNum}
+ </if>
<if test="feeYear !=null and feeYear != ''">
and t.fee_year= #{feeYear}
</if>
@@ -762,14 +1087,150 @@
and pfc.start_time <= #{endTime}
</if>
<if test="yearMonth !=null and yearMonth != ''">
- and concat(t.fee_year,t.fee_month) = #{yearMonth}
+ and concat(t.fee_year,lpad(t.fee_month,2,0)) = #{yearMonth}
</if>
- group by t.config_id,t.fee_name,pfc.start_time
+ group by t.fee_name,td.name ,pfc.fee_type_cd,t.config_id ,t.create_time
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
</select>
+
+ <select id="queryFeeBreakdownDetailCount" parameterType="Map" resultType="Map">
+ select count(1) count
+ 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'
+ 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}
+ </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="objNameNum != null and objNameNum != ''">
+ and t.obj_name_num= #{objNameNum}
+ </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="feeTypeCd != null and feeTypeCd != ''">
+ and pfc.fee_type_cd = #{feeTypeCd}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="startTime !=null and startTime != ''">
+ and pfc.start_time >= #{startTime}
+ </if>
+ <if test="endTime !=null and endTime != ''">
+ and pfc.start_time <= #{endTime}
+ </if>
+ <if test="yearMonth !=null and yearMonth != ''">
+ and concat(t.fee_year,lpad(t.fee_month,2,0)) = #{yearMonth}
+ </if>
+ </select>
+
+ <!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03
+ and t.receivable_amount >= 0 and t.received_amount >= 0 and t.owe_amount >= 0
+ -->
+ <select id="queryFeeBreakdownDetail" parameterType="Map" resultType="Map">
+ select t.obj_name objName,t.fee_name feeName,t.fee_year feeYear,t.fee_month feeMonth,t.create_time createTime
+ ,t.config_id configId,t.his_owe_amount hisOweAmount,t.obj_name_num objNameNum,t.cur_receivable_amount
+ curReceivableAmount,t.cur_received_amount curReceivedAmount,t.his_owe_received_amount
+ hisOweReceivedAmount,t.pre_received_amount preReceivedAmount,
+ t.update_time updateTime,t.his_owe_amount+t.cur_receivable_amount receivableAmount,
+ t.cur_received_amount+t.his_owe_received_amount+t.pre_received_amount receivedAmount,t.update_time
+ updateTime
+ 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'
+ 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}
+ </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="objNameNum != null and objNameNum != ''">
+ and t.obj_name_num= #{objNameNum}
+ </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="feeTypeCd != null and feeTypeCd != ''">
+ and pfc.fee_type_cd = #{feeTypeCd}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="startTime !=null and startTime != ''">
+ and pfc.start_time >= #{startTime}
+ </if>
+ <if test="endTime !=null and endTime != ''">
+ and pfc.start_time <= #{endTime}
+ </if>
+ <if test="yearMonth !=null and yearMonth != ''">
+ and concat(t.fee_year,lpad(t.fee_month,2,0)) = #{yearMonth}
+ </if>
+ order by t.create_time desc
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
+ </select>
+
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 and t.receivable_amount >= 0 and t.received_amount >= 0 and t.owe_amount >= 0 -->
<select id="queryFeeBreakdownMajor" parameterType="Map" resultType="Map">
select
@@ -800,6 +1261,9 @@
<if test="objName !=null and objName != ''">
and t.obj_name= #{objName}
</if>
+ <if test="objNameNum != null and objNameNum != ''">
+ and t.obj_name_num= #{objNameNum}
+ </if>
<if test="feeYear !=null and feeYear != ''">
and t.fee_year= #{feeYear}
</if>
@@ -831,7 +1295,7 @@
and pfc.start_time <= #{endTime}
</if>
<if test="yearMonth !=null and yearMonth != ''">
- and concat(t.fee_year,t.fee_month) = #{yearMonth}
+ and concat(t.fee_year,lpad(t.fee_month,2,0)) = #{yearMonth}
</if>
order by t.create_time desc
</select>
@@ -859,6 +1323,9 @@
<if test="objName !=null and objName != ''">
and t.obj_name= #{objName}
</if>
+ <if test="objNameNum != null and objNameNum != ''">
+ and t.obj_name_num= #{objNameNum}
+ </if>
<if test="feeYear !=null and feeYear != ''">
and t.fee_year= #{feeYear}
</if>
@@ -881,10 +1348,13 @@
and t.community_id= #{communityId}
</if>
<if test="startTime !=null and startTime != ''">
- and t.create_time >= #{startTime}
+ and t.fee_create_time >= #{startTime}
</if>
<if test="endTime !=null and endTime != ''">
- and t.create_time <= #{endTime}
+ and t.deadline_time <= #{endTime}
+ </if>
+ <if test="feeTypeCd !=null and feeTypeCd != ''">
+ and pfc.fee_type_cd = #{feeTypeCd}
</if>
group by t.config_id,t.fee_name,t.fee_create_time,t.obj_id,t.obj_name,t.deadline_time
) t
@@ -892,10 +1362,16 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� 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,pfa.`value`
+ select t.config_id configId,t.obj_id objId,t.obj_name objName,t.obj_type objType,t.fee_name
+ feeName,t.fee_create_time feeCreateTime,pfa.`value`
ownerName,br.built_up_area builtUpArea ,max(t.deadline_time)
- deadlineTime,t.create_time createTime,SUM(t.receivable_amount) receivableAmount,SUM(t.received_amount)
- receivedAmount,SUM(t.owe_amount) oweAmount,max(t.update_time) updateTime
+ deadlineTime,max(t.create_time) createTime,max(t.update_time) updateTime,SUM(t.his_owe_amount)
+ hisOweAmount,SUM(t.cur_receivable_amount) curReceivableAmount,
+ SUM(t.cur_received_amount) curReceivedAmount,SUM(t.his_owe_received_amount)
+ hisOweReceivedAmount,SUM(t.pre_received_amount) preReceivedAmount,
+ sum(t.his_owe_amount+t.cur_receivable_amount) receivableAmount,
+ sum(t.cur_received_amount+t.his_owe_received_amount+t.pre_received_amount) receivedAmount,
+ t.obj_type objType,t.obj_name_num objNameNum
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'
@@ -903,7 +1379,8 @@
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'
left join pay_fee_attrs pfa on pf.fee_id = pfa.fee_id and pfa.spec_cd = '390008' and pfa.status_cd ='0'
- where t.status_cd = '0' and t.receivable_amount >=0 and t.receivable_amount >= 0
+ where t.status_cd = '0'
+
<if test="roomNum !=null and roomNum != ''">
and br.room_num= #{roomNum}
</if>
@@ -916,6 +1393,9 @@
<if test="objName !=null and objName != ''">
and t.obj_name= #{objName}
</if>
+ <if test="objNameNum != null and objNameNum != ''">
+ and t.obj_name_num= #{objNameNum}
+ </if>
<if test="feeYear !=null and feeYear != ''">
and t.fee_year= #{feeYear}
</if>
@@ -938,12 +1418,16 @@
and t.community_id= #{communityId}
</if>
<if test="startTime !=null and startTime != ''">
- and t.create_time >= #{startTime}
+ and t.fee_create_time >= #{startTime}
</if>
<if test="endTime !=null and endTime != ''">
- and t.create_time <= #{endTime}
+ and t.deadline_time <= #{endTime}
</if>
- group by t.config_id,t.fee_name,t.fee_create_time,t.obj_id,t.obj_name,pfa.`value`,br.built_up_area
+ <if test="feeTypeCd !=null and feeTypeCd != ''">
+ and pfc.fee_type_cd = #{feeTypeCd}
+ </if>
+ group by t.config_id,t.fee_name,t.fee_create_time,t.obj_id,t.obj_type,t.obj_name,pfa.`value`,br.built_up_area
+ order by pfa.`value`
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -951,8 +1435,14 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryAllFeeDetail" parameterType="Map" resultType="Map">
- select SUM(t.receivable_amount) allReceivableAmount,SUM(t.received_amount) allReceivedAmount,
- SUM(t.owe_amount) allOweAmount from report_fee_month_statistics t
+ select
+ SUM(t.his_owe_amount + t.cur_receivable_amount) allReceivableAmount,
+ SUM(t.cur_received_amount+t.his_owe_received_amount+t.pre_received_amount) allReceivedAmount,
+ if(SUM(t.his_owe_amount + t.cur_receivable_amount - t.cur_received_amount - t.his_owe_received_amount) < 0,0,
+ SUM(t.his_owe_amount + t.cur_receivable_amount - t.cur_received_amount - t.his_owe_received_amount))
+ allOweAmount,
+ SUM(t.his_owe_received_amount) allHisOweReceivedAmount
+ 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'
@@ -971,6 +1461,9 @@
<if test="objName !=null and objName != ''">
and t.obj_name= #{objName}
</if>
+ <if test="objNameNum != null and objNameNum != ''">
+ and t.obj_name_num= #{objNameNum}
+ </if>
<if test="feeYear !=null and feeYear != ''">
and t.fee_year= #{feeYear}
</if>
@@ -993,10 +1486,10 @@
and t.community_id= #{communityId}
</if>
<if test="startTime !=null and startTime != ''">
- and t.create_time >= #{startTime}
+ and t.fee_create_time >= #{startTime}
</if>
<if test="endTime !=null and endTime != ''">
- and t.create_time <= #{endTime}
+ and t.deadline_time <= #{endTime}
</if>
</select>
@@ -1045,15 +1538,16 @@
<if test="endTime !=null and endTime != ''">
and t.create_time <= #{endTime}
</if>
- group by t.fee_name,t.payer_obj_id,t.payer_obj_name
+ and t.amount_owed > 0 and pf.end_time < now()
+ group by t.payer_obj_name ,t.fee_name ,pf.end_time ,t.create_time
HAVING oweAmount > 0
) t
</select>
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryOweFeeDetail" parameterType="Map" resultType="Map">
- select t.payer_obj_name objName,t.fee_name feeName,pf.end_time feeCreateTime,t.update_time
- updateTime,pfa.`value` ownerName,br.built_up_area builtUpArea ,SUM(t.amount_owed) oweAmount,max(t.deadline_time)
+ select t.payer_obj_name objName,t.fee_name feeName,pf.end_time feeCreateTime,t.update_time updateTime,
+ pfa.`value` ownerName,br.built_up_area builtUpArea ,SUM(t.amount_owed) oweAmount,max(t.deadline_time)
deadlineTime
from report_owe_fee t
inner join pay_fee_config pfc on t.config_id = pfc.config_id and pfc.status_cd = '0'
@@ -1069,8 +1563,14 @@
<if test="unitId !=null and unitId != ''">
and bu.unit_id= #{unitId}
</if>
+ <if test="unitNum !=null and unitNum != ''">
+ and bu.unit_num= #{unitNum}
+ </if>
<if test="floorId !=null and floorId != ''">
and f.floor_id = #{floorId}
+ </if>
+ <if test="floorNum !=null and floorNum != ''">
+ and f.floor_num = #{floorNum}
</if>
<if test="objName !=null and objName != ''">
and t.payer_obj_name= #{objName}
@@ -1096,8 +1596,10 @@
<if test="endTime !=null and endTime != ''">
and t.create_time <= #{endTime}
</if>
- group by t.fee_name,t.payer_obj_id,t.payer_obj_name,pfa.`value`,br.built_up_area
+ and t.amount_owed > 0 and pf.end_time < now()
+ group by t.payer_obj_name ,t.fee_name ,pf.end_time ,t.update_time,pfa.`value` ,br.built_up_area
HAVING oweAmount > 0
+ order by t.payer_obj_name
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -1155,8 +1657,8 @@
t.receivable_amount receivableAmount,t.received_amount receivedAmount,d.name,d2.name feeTypeCdName,
pfc.fee_type_cd feeTypeCd,t.state,d3.name stateName
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 pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
+ left 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'
@@ -1168,15 +1670,21 @@
= "fee_type_cd"
left join t_dict d3 on t.state = d3.status_cd and d3.table_name = "pay_fee_detail" and d3.table_columns =
"state"
- where t.status_cd = '0'
+ where t.status_cd = '0' and pf.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="unitNum !=null and unitNum != ''">
+ and bu.unit_num= #{unitNum}
+ </if>
<if test="floorId !=null and floorId != ''">
and f.floor_id = #{floorId}
+ </if>
+ <if test="floorNum !=null and floorNum != ''">
+ and f.floor_num = #{floorNum}
</if>
<if test="objName !=null and objName != ''">
and t.obj_name= #{objName}
@@ -1217,6 +1725,18 @@
<if test="endTime !=null and endTime != ''">
and t.create_time <= #{endTime}
</if>
+ <if test="feeStartTime !=null and feeStartTime != ''">
+ and t.start_time >= #{feeStartTime}
+ </if>
+ <if test="feeEndTime !=null and feeEndTime != ''">
+ and t.end_time <= #{feeEndTime}
+ </if>
+ <if test="cashierId !=null and cashierId != ''">
+ and t.cashier_id= #{cashierId}
+ </if>
+ <if test="cashierName !=null and cashierName != ''">
+ and t.cashier_name= #{cashierName}
+ </if>
) t
</select>
@@ -1229,10 +1749,11 @@
importFeeName,t.prime_rate,d.name primeRate,fdr.discount_small_type discountSmallType,fdr.rule_name
ruleName,pfdd.discount_price discountPrice,co.contract_code contractCode,pfo.`value` ownerName,cb.o_id oId,
d2.name feeTypeCdName,pfc.fee_type_cd feeTypeCd,t.state,d3.name stateName,t.fee_id feeId,pft.`value` repairId,
- t.detail_id,t.detail_id detailId,pf.payer_obj_id,pfb.value ownerId,concat(pa.num,'鍋滆溅鍦�',ps.num,'杞︿綅') psName
+ t.detail_id,t.detail_id detailId,pf.payer_obj_id,pfb.value ownerId,concat(pa.num,'鍋滆溅鍦�',ps.num,'杞︿綅') psName,
+ fad.amount withholdAmount,t.cashier_id cashierId,t.cashier_name cashierName,t.payable_amount payableAmount,pfc.fee_flag feeFlag
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 pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
+ left 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'
@@ -1254,15 +1775,24 @@
"state"
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
+ left join fee_account_detail fad on t.detail_id = fad.detail_id and t.community_id = fad.community_id and
+ fad.status_cd = '0' and fad.state = '1002'
where t.status_cd = '0'
+ and pf.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="unitNum !=null and unitNum != ''">
+ and bu.unit_num= #{unitNum}
+ </if>
<if test="floorId !=null and floorId != ''">
and f.floor_id = #{floorId}
+ </if>
+ <if test="floorNum !=null and floorNum != ''">
+ and f.floor_num = #{floorNum}
</if>
<if test="objName !=null and objName != ''">
and t.obj_name= #{objName}
@@ -1303,6 +1833,18 @@
<if test="endTime !=null and endTime != ''">
and t.create_time <= #{endTime}
</if>
+ <if test="feeStartTime !=null and feeStartTime != ''">
+ and t.start_time >= #{feeStartTime}
+ </if>
+ <if test="feeEndTime !=null and feeEndTime != ''">
+ and t.end_time <= #{feeEndTime}
+ </if>
+ <if test="cashierId !=null and cashierId != ''">
+ and t.cashier_id= #{cashierId}
+ </if>
+ <if test="cashierName !=null and cashierName != ''">
+ and t.cashier_name= #{cashierName}
+ </if>
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
@@ -1312,22 +1854,28 @@
<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 pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
+ left 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' 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' and t.state not in ('1100','1300')
+ 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="unitNum !=null and unitNum != ''">
+ and bu.unit_num= #{unitNum}
+ </if>
<if test="floorId !=null and floorId != ''">
and f.floor_id = #{floorId}
+ </if>
+ <if test="floorNum !=null and floorNum != ''">
+ and f.floor_num = #{floorNum}
</if>
<if test="objName !=null and objName != ''">
and t.obj_name= #{objName}
@@ -1372,8 +1920,8 @@
ruleName,pfdd.discount_price,
SUM(pfdd.discount_price) discountPrice
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 pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
+ left 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'
@@ -1384,15 +1932,21 @@
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' and t.state not in ('1100','1300')
+ 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="unitNum !=null and unitNum != ''">
+ and bu.unit_num= #{unitNum}
+ </if>
<if test="floorId !=null and floorId != ''">
and f.floor_id = #{floorId}
+ </if>
+ <if test="floorNum !=null and floorNum != ''">
+ and f.floor_num = #{floorNum}
</if>
<if test="objName !=null and objName != ''">
and t.obj_name= #{objName}
@@ -1427,111 +1981,65 @@
<if test="endTime !=null and endTime != ''">
and t.create_time <= #{endTime}
</if>
- group by fdr.discount_small_type
+ group by pfc.fee_name,f.floor_num,bu.unit_num ,br.room_num ,oc.car_num ,
+ pf.payer_obj_type ,t.start_time ,t.end_time ,t.create_time ,
+ t.receivable_amount ,t.received_amount ,pfa.`value`
+ ,t.prime_rate,d.name ,fdr.discount_small_type ,fdr.rule_name,pfdd.discount_price
order by t.create_time desc
</select>
<select id="queryDeadlineFeeCount" parameterType="Map" resultType="Map">
select count(1) count
- from (
- SELECT
- t.obj_name objName,
- t.fee_name feeName,
- t.deadline_time deadlineTime
- 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'
- 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}
- </if>
- <if test="unitId !=null and unitId != ''">
- and bu.unit_id= #{unitId}
- </if>
- <if test="floorId !=null and floorId != ''">
- and f.floor_id = #{floorId}
+ from pay_fee_detail_month t
+ inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
+ where 1=1
+ and t.detail_id = '-1'
+ <if test="configId !=null and configId != ''">
+ and t.config_id = #{configId}
</if>
<if test="objName !=null and objName != ''">
- and t.obj_name= #{objName}
+ and t.obj_name like CONCAT('%',#{objName},'%')
</if>
- <if test="feeYear !=null and feeYear != ''">
- and t.fee_year= #{feeYear}
+ <if test="ownerName !=null and ownerName != ''">
+ and t.owner_name like CONCAT('%',#{ownerName},'%')
</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 t.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 test="link !=null and link != ''">
+ and t.link = #{link}
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
- <if test="startTime !=null and startTime != ''">
+ <if test="startTime !=null and startTime !=''">
and t.deadline_time >= #{startTime}
</if>
<if test="endTime !=null and endTime != ''">
and t.deadline_time <= #{endTime}
</if>
- ) t
</select>
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryDeadlineFee" parameterType="Map" resultType="Map">
- SELECT
+
+ select
t.obj_name objName,
+ pf.payer_obj_type objType,
t.fee_name feeName,
t.deadline_time deadlineTime
- 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'
- 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}
- </if>
- <if test="unitId !=null and unitId != ''">
- and bu.unit_id= #{unitId}
- </if>
- <if test="floorId !=null and floorId != ''">
- and f.floor_id = #{floorId}
+ from pay_fee_detail_month t
+ inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
+ where 1=1
+ and t.detail_id = '-1'
+ <if test="configId !=null and configId != ''">
+ and t.config_id = #{configId}
</if>
<if test="objName !=null and objName != ''">
- and t.obj_name= #{objName}
+ and t.obj_name like CONCAT('%',#{objName},'%')
</if>
- <if test="feeYear !=null and feeYear != ''">
- and t.fee_year= #{feeYear}
+ <if test="ownerName !=null and ownerName != ''">
+ and t.owner_name like CONCAT('%',#{ownerName},'%')
</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 t.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 test="link !=null and link != ''">
+ and t.link = #{link}
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -1551,24 +2059,34 @@
<select id="queryPrePaymentNewCount" parameterType="Map" resultType="Map">
select count(1) count
from (
- select pfc.fee_name feeName, f.floor_num floorNum,bu.unit_num unitNum,br.room_num roomNum,t.end_time endTime
- ,oc.car_num carNum
+ select pfc.fee_name feeName,pfa.`value` objName,pfa1.`value` link,pfa2.`value` ownerName, t.end_time endTime ,
+ t.payer_obj_type payerObjType
from pay_fee 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.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 pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390012' and pfa.status_cd = '0'
+ LEFT JOIN pay_fee_attrs pfa1 on t.fee_id = pfa1.fee_id and pfa1.spec_cd = '390009' and pfa1.status_cd = '0'
+ LEFT JOIN pay_fee_attrs pfa2 on t.fee_id = pfa2.fee_id and pfa2.spec_cd = '390008' and pfa2.status_cd = '0'
where t.state = '2008001'
and t.status_cd = '0'
+ <if test="ownerName != null and ownerName != ''">
+ and pfa2.value like concat('%' #{ownerName} ,'%')
+ </if>
+ <if test="objName != null and objName != ''">
+ and pfa.`value` like concat('%',#{objName},'%')
+ </if>
+ <if test="link != null and link != ''">
+ and pfa1.`value` = #{link}
+ </if>
+ <if test="configId !=null and configId != ''">
+ and t.config_id = #{configId}
+ </if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
<if test="startTime !=null and startTime != ''">
and t.end_time >= #{startTime}
</if>
- <if test="endTime !=null and endTime != ''">
+ <if test="endTime !=null and endTime != ''">
and t.end_time <= #{endTime}
</if>
) t
@@ -1576,17 +2094,27 @@
<!-- 鏌ヨ璐圭敤鏈堢粺璁′俊鎭� add by wuxw 2018-07-03 -->
<select id="queryPrePayment" parameterType="Map" resultType="Map">
- select pfc.fee_name feeName, f.floor_num floorNum,bu.unit_num unitNum,br.room_num roomNum,t.end_time endTime ,
- oc.car_num carNum,t.payer_obj_type payerObjType
+ select pfc.fee_name feeName,pfa.`value` objName,pfa1.`value` link,pfa2.`value` ownerName, t.end_time endTime ,
+ t.payer_obj_type payerObjType
from pay_fee 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.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 pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390012' and pfa.status_cd = '0'
+ LEFT JOIN pay_fee_attrs pfa1 on t.fee_id = pfa1.fee_id and pfa1.spec_cd = '390009' and pfa1.status_cd = '0'
+ LEFT JOIN pay_fee_attrs pfa2 on t.fee_id = pfa2.fee_id and pfa2.spec_cd = '390008' and pfa2.status_cd = '0'
where t.state = '2008001'
and t.status_cd = '0'
+ <if test="ownerName != null and ownerName != ''">
+ and pfa2.value like concat('%' #{ownerName} ,'%')
+ </if>
+ <if test="objName != null and objName != ''">
+ and pfa.`value` like concat('%',#{objName},'%')
+ </if>
+ <if test="link != null and link != ''">
+ and pfa1.`value` = #{link}
+ </if>
+ <if test="configId !=null and configId != ''">
+ and t.config_id = #{configId}
+ </if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
@@ -1602,62 +2130,66 @@
</select>
<select id="queryPrePaymentCount" parameterType="Map" resultType="Map">
- select pfc.fee_name feeName,count(t.payer_obj_id) objCount from pay_fee t
+ select pfc.fee_name feeName, count(t.payer_obj_id) objCount
+ from pay_fee t
inner join pay_fee_config pfc on t.config_id = pfc.config_id and pfc.status_cd = '0'
where t.state = '2008001'
and t.status_cd = '0'
and t.end_time > #{startTime}
and t.end_time < #{endTime}
- and t.community_id= #{communityId}
- group by pfc.fee_name ,pfc.config_id
+ and t.community_id = #{communityId}
+ group by pfc.fee_name, pfc.config_id
order by objCount
</select>
<select id="queryDeadlinePaymentCount" parameterType="Map" resultType="Map">
- SELECT
- t.fee_name feeName,
- count(t.obj_id) objCount
- FROM
- report_fee_month_statistics t
- 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
- 1 = 1
+ SELECT t.fee_name feeName, count(t.obj_id) objCount
+ FROM report_fee_month_statistics t
+ 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 1 = 1
AND t.status_cd = '0'
- and t.community_id= #{communityId}
+ and t.community_id = #{communityId}
AND t.deadline_time > #{startTime}
AND t.deadline_time < #{endTime}
- group by t.config_id,t.fee_name
+ group by t.config_id, t.fee_name
order by objCount desc
</select>
<select id="queryOwePaymentCount" parameterType="Map" resultType="Map">
- select t.fee_name feeName,count( distinct t.obj_id) objCount
+ select t.fee_name feeName, count(distinct t.obj_id) objCount
from report_fee_month_statistics t
- inner join pay_fee pf on t.fee_id = pf.fee_id and pf.community_id = t.community_id and pf.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.community_id = #{communityId}
and t.owe_amount > 0
- group by t.config_id,t.fee_name
+ group by t.config_id, t.fee_name
order by objCount desc
</select>
<select id="queryAllPaymentCount" parameterType="Map" resultType="Map">
- select t.fee_name feeName,count(distinct t.obj_id) objCount
+ select t.fee_name feeName, count(distinct t.obj_id) objCount
from report_fee_month_statistics t
- inner join pay_fee pf on t.fee_id = pf.fee_id and pf.community_id = t.community_id and pf.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.community_id = #{communityId}
- group by t.config_id,t.fee_name
+ group by t.config_id, t.fee_name
order by objCount desc
</select>
<select id="queryFinishOweFee" parameterType="Map" resultType="Map">
- select t.config_id configId, t.fee_id feeId,t.statistics_id statisticsId,t.fee_year feeYear,fee_month feeMonth
+ select t.config_id configId,
+ t.fee_id feeId,
+ t.statistics_id statisticsId,
+ t.fee_year feeYear,
+ fee_month feeMonth
from report_fee_month_statistics t
- inner join pay_fee pf on t.fee_id = pf.fee_id and pf.state = '2009001' and pf.community_id = #{communityId} and
+ inner join pay_fee pf
+ on t.fee_id = pf.fee_id and pf.state = '2009001' and pf.community_id = #{communityId} and
pf.status_cd = '0'
where t.owe_amount > 0
and t.status_cd = '0'
- and t.community_id = #{communityId}
- limit 100
+ and t.community_id = #{communityId} limit 100
</select>
<!-- 鏌ヨ璐圭敤閰嶇疆淇℃伅 add by wuxw 2018-07-03 -->
@@ -1856,6 +2388,7 @@
<select id="queryRepairForStaff" parameterType="Map" resultType="Map">
SELECT r.staff_id staffId,r.staff_name staffName,r.state FROM r_repair_user r
+ inner join u_user u on u.user_id = r.staff_id and u.status_cd = '0'
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'
@@ -1873,33 +2406,61 @@
</select>
<select id="getReceivableInformation" parameterType="Map" resultType="Map">
- select sum(t.receivable_amount) receivableAmount,SUM(t.received_amount) receivedAmount,SUM(t.owe_amount)
- oweAmount
+ select a.receivableAmount,a.receivedAmount, IF(a.receivableAmount <
+ a.oweReceivedAmount,'0',a.receivableAmount-a.oweReceivedAmount) oweAmount
+ from (
+ select sum(t.his_owe_amount+t.cur_receivable_amount)
+ receivableAmount,sum(t.cur_received_amount+t.his_owe_received_amount+t.pre_received_amount) receivedAmount,
+ sum(t.cur_received_amount+t.his_owe_received_amount) oweReceivedAmount
from report_fee_month_statistics t
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
- where t.community_id = #{communityId}
+ where 1=1
+ and t.fee_year= #{feeYear}
+ and t.fee_month= #{feeMonth}
+ and t.community_id = #{communityId}
+ ) a
</select>
<select id="getFloorReceivableInformation" parameterType="Map" resultType="Map">
- select f.floor_num floorNum,f.`name`,sum(t.receivable_amount) receivableAmount,SUM(t.received_amount)
- receivedAmount,SUM(t.owe_amount) oweAmount
+ select a.floorNum,a.`name`,a.receivableAmount,a.receivedAmount, IF(a.receivableAmount <
+ a.oweReceivedAmount,'0',a.receivableAmount-a.oweReceivedAmount) oweAmount
+ from (
+ select f.floor_num floorNum,f.`name`,sum(t.his_owe_amount+t.cur_receivable_amount)
+ receivableAmount,sum(t.cur_received_amount+t.his_owe_received_amount+t.pre_received_amount) receivedAmount,
+ sum(t.cur_received_amount+t.his_owe_received_amount) oweReceivedAmount
from report_fee_month_statistics t
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
inner join building_room br on br.room_id = t.obj_id and t.obj_type = '3333' and br.community_id =
t.community_id and br.status_cd = '0'
inner join building_unit bu on bu.unit_id = br.unit_id and bu.status_cd = '0'
inner join f_floor f on f.floor_id = bu.floor_id and f.status_cd = '0'
- where t.community_id = #{communityId}
+ where 1=1
+ and t.fee_year= #{feeYear}
+ and t.fee_month= #{feeMonth}
+ and t.community_id = #{communityId}
group by f.floor_num ,f.`name`
+ ) a
</select>
<select id="getFeeConfigReceivableInformation" parameterType="Map" resultType="Map">
- select t.fee_name feeName,sum(t.receivable_amount) receivableAmount,SUM(t.received_amount)
- receivedAmount,SUM(t.owe_amount) oweAmount
+ select a.feeName,a.receivableAmount,a.receivedAmount, IF(a.receivableAmount <
+ a.oweReceivedAmount,'0',a.receivableAmount-a.oweReceivedAmount) oweAmount
+ from (
+ select t.fee_name feeName,sum(t.his_owe_amount+t.cur_receivable_amount)
+ receivableAmount,sum(t.cur_received_amount+t.his_owe_received_amount+t.pre_received_amount) receivedAmount,
+ sum(t.cur_received_amount+t.his_owe_received_amount) oweReceivedAmount
from report_fee_month_statistics t
inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
- where t.community_id = #{communityId}
+ left join building_room br on br.room_id = t.obj_id and t.obj_type = '3333' and br.community_id =
+ t.community_id and br.status_cd = '0'
+ left join building_unit bu on bu.unit_id = br.unit_id and bu.status_cd = '0'
+ left join f_floor f on f.floor_id = bu.floor_id and f.status_cd = '0'
+ where 1=1
+ and t.fee_year= #{feeYear}
+ and t.fee_month= #{feeMonth}
+ and t.community_id = #{communityId}
group by t.fee_name
+ ) a
</select>
@@ -1907,11 +2468,14 @@
<select id="queryNoFeeRoomsCount" parameterType="Map" resultType="Map">
select count(1) count
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'
where t.status_cd = '0'
- and not exists(
- select 1 from pay_fee pf where t.room_id = pf.payer_obj_id and pf.status_cd = '0' and pf.state = '2008001'
+ and not exists (
+ select 1 from pay_fee pf where t.room_id = pf.payer_obj_id
+ and pf.status_cd = '0'
+ and pf.state = '2008001'
)
and t.community_id = #{communityId}
</select>
@@ -1930,7 +2494,7 @@
select 1 from pay_fee pf where t.room_id = pf.payer_obj_id and pf.status_cd = '0' and pf.state = '2008001'
)
and t.community_id = #{communityId}
- order by t.create_time desc
+ order by bo.name
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -2214,6 +2778,12 @@
<if test="objName !=null and objName != ''">
and rfms.obj_name= #{objName}
</if>
+ <if test="feeYear !=null and feeYear != ''">
+ and rfms.fee_year= #{feeYear}
+ </if>
+ <if test="feeMonth !=null and feeMonth != ''">
+ and rfms.fee_month= #{feeMonth}
+ </if>
GROUP BY t.floor_num
) a,
(select t.floor_num floorNum,SUM(curT.owe_amount) curOweAmount
@@ -2231,6 +2801,9 @@
</if>
<if test="feeYear !=null and feeYear != ''">
and curT.fee_year= #{feeYear}
+ </if>
+ <if test="feeMonth !=null and feeMonth != ''">
+ and curT.fee_month= #{feeMonth}
</if>
GROUP BY t.floor_num
) b
@@ -2261,6 +2834,12 @@
<if test="objName !=null and objName != ''">
and rfms.obj_name= #{objName}
</if>
+ <if test="feeYear !=null and feeYear != ''">
+ and rfms.fee_year= #{feeYear}
+ </if>
+ <if test="feeMonth !=null and feeMonth != ''">
+ and rfms.fee_month= #{feeMonth}
+ </if>
GROUP BY t.floor_num
) a,
(select t.floor_num floorNum,SUM(curT.owe_amount) curOweAmount
@@ -2278,6 +2857,9 @@
</if>
<if test="feeYear !=null and feeYear != ''">
and curT.fee_year= #{feeYear}
+ </if>
+ <if test="feeMonth !=null and feeMonth != ''">
+ and curT.fee_month= #{feeMonth}
</if>
GROUP BY t.floor_num
) b
@@ -2397,11 +2979,11 @@
<select id="queryHuaningPayFeeTwoCount" parameterType="Map" resultType="Map">
select count(1) count
from (
- select a.floorNum,d.receivableAmount ,
- a.receivedAmount,b.receivedAmount1,
+ select a.floorNum, d.receivableAmount,
+ a.receivedAmount, b.receivedAmount1,
c.receivedAmount2
from
- (select t.floor_num floorNum,sum(pfd.received_amount) receivedAmount
+ (select t.floor_num floorNum, sum (pfd.received_amount) receivedAmount
from f_floor t
inner JOIN building_unit bu on t.floor_id = bu.floor_id and bu.status_cd = '0'
inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
@@ -2409,11 +2991,11 @@
inner join pay_fee_detail pfd on pf.fee_id = pfd.fee_id and pfd.status_cd = '0'
where 1=1
and t.status_cd = '0'
- and DATE_FORMAT(pfd.create_time,'%Y-%m') = #{yearMonth}
+ and DATE_FORMAT(pfd.create_time, '%Y-%m') = #{yearMonth}
and t.community_id= #{communityId}
GROUP BY floor_num
) a,
- (select t.floor_num floorNum,SUM(pfdm1.discount_amount) receivedAmount1
+ (select t.floor_num floorNum, SUM (pfdm1.discount_amount) receivedAmount1
from f_floor t
inner JOIN building_unit bu on t.floor_id = bu.floor_id and bu.status_cd = '0'
inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
@@ -2423,11 +3005,11 @@
pfdm1.status_cd = '0' and pfdm1.detail_year = #{year} and pfdm1.detail_month < #{month}
where 1=1
and t.status_cd = '0'
- and DATE_FORMAT(pfd.create_time,'%Y-%m') = #{yearMonth}
+ and DATE_FORMAT(pfd.create_time, '%Y-%m') = #{yearMonth}
and t.community_id= #{communityId}
GROUP BY floor_num
) b,
- (select t.floor_num floorNum,SUM(pfdm2.received_amount) receivedAmount2
+ (select t.floor_num floorNum, SUM (pfdm2.received_amount) receivedAmount2
from f_floor t
inner JOIN building_unit bu on t.floor_id = bu.floor_id and bu.status_cd = '0'
inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
@@ -2437,11 +3019,11 @@
pfdm2.status_cd = '0' and pfdm2.detail_year = #{year} and pfdm2.detail_month > #{month}
where 1=1
and t.status_cd = '0'
- and DATE_FORMAT(pfd.create_time,'%Y-%m') = #{yearMonth}
+ and DATE_FORMAT(pfd.create_time, '%Y-%m') = #{yearMonth}
and t.community_id= #{communityId}
GROUP BY floor_num
) c,
- (select t.floor_num floorNum,SUM(rfms.owe_amount) receivableAmount
+ (select t.floor_num floorNum, SUM (rfms.owe_amount) receivableAmount
from f_floor t
inner JOIN building_unit bu on t.floor_id = bu.floor_id and bu.status_cd = '0'
inner JOIN building_room br on br.unit_id = bu.unit_id and br.status_cd = '0'
@@ -2552,19 +3134,18 @@
<select id="getReceivedAmountByMonth" parameterType="Map" resultType="Map">
select ifnull(sum(t.received_amount),0) total
from pay_fee_detail_month t
- where
- 1=1
+ where 1=1
and t.create_time > #{startTime}
and t.create_time < #{endTime}
and t.fee_id = #{feeId}
<if test="flag == 1">
- and concat(t.detail_year,t.detail_month) = #{yearMonth}
+ and concat(t.detail_year,lpad(t.detail_month,2,0)) = #{yearMonth}
</if>
<if test="flag == 2">
- and concat(t.detail_year,t.detail_month) < #{yearMonth}
+ and concat(t.detail_year,lpad(t.detail_month,2,0)) < #{yearMonth}
</if>
<if test="flag == 3">
- and concat(t.detail_year,t.detail_month) > #{yearMonth}
+ and concat(t.detail_year,lpad(t.detail_month,2,0)) > #{yearMonth}
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -2586,6 +3167,22 @@
</foreach>
</select>
+ <!-- 鏌ヨ鏃犳晥璐圭敤 add by wuxw 2018-07-03 -->
+ <select id="queryInvalidFeeMonthStatistics" parameterType="Map" resultType="Map">
+ select t.fee_id feeId
+ from pay_fee t
+ inner join pay_fee_config pfc on t.config_id = pfc.config_id
+ inner join report_fee_month_statistics rfms on t.fee_id = rfms.fee_id and rfms.status_cd = '0'
+ where (t.status_cd = '1' or pfc.status_cd = '1')
+ and t.community_id = #{communityId}
+ </select>
-
+ <!--娓呯悊鎶ヨ〃 鏃犳晥鏁版嵁-->
+ <update id="deleteInvalidFee" parameterType="Map">
+ delete from report_fee_month_statistics where fee_id in
+ <foreach collection="feeIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ and community_id = #{communityId}
+ </update>
</mapper>
--
Gitblit v1.8.0