|
|
@@ -2305,12 +2305,23 @@
|
|
|
</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.receivedAmount,'0',a.receivableAmount-a.receivedAmount) 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
|
|
|
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}
|
|
|
+ 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 1=1
|
|
|
+ and t.fee_year= #{feeYear}
|
|
|
+ and t.fee_month= #{feeMonth}
|
|
|
+ and t.community_id = #{communityId}
|
|
|
group by t.fee_name
|
|
|
+ ) a
|
|
|
</select>
|
|
|
|
|
|
|