|
|
@@ -633,8 +633,7 @@
|
|
|
select count(1) count
|
|
|
from (
|
|
|
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
|
|
|
+ createTime
|
|
|
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'
|
|
|
@@ -687,7 +686,7 @@
|
|
|
and pfc.start_time <= #{endTime}
|
|
|
</if>
|
|
|
<if test="yearMonth !=null and yearMonth != ''">
|
|
|
- and concat(t.detail_year,t.detail_month) = #{yearMonth}
|
|
|
+ and concat(t.fee_year,t.fee_month) = #{yearMonth}
|
|
|
</if>
|
|
|
|
|
|
group by t.config_id,t.fee_name,pfc.start_time
|
|
|
@@ -754,7 +753,7 @@
|
|
|
and pfc.start_time <= #{endTime}
|
|
|
</if>
|
|
|
<if test="yearMonth !=null and yearMonth != ''">
|
|
|
- and concat(t.detail_year,t.detail_month) = #{yearMonth}
|
|
|
+ and concat(t.fee_year,t.fee_month) = #{yearMonth}
|
|
|
</if>
|
|
|
group by t.config_id,t.fee_name,pfc.start_time
|
|
|
order by t.create_time desc
|