Merge branch 'master' into wangfy-dev

wfy

2021-09-18 0417d31de9980cbc1735daffffb308d050ce35b4

 java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml

@@ -89,7 +89,9 @@
        update report_fee_month_statistics t set
        t.owe_amount= #{oweAmount}
        where 1=1
        <if test="statisticsId !=null and statisticsId != ''">
            and t.statistics_id= #{statisticsId}
        </if>
        <if test="curMaxTime !=null ">
            and t.cur_max_time &lt;= #{curMaxTime}
        </if>
@@ -627,7 +629,7 @@
    <select id="queryFeeBreakdown" parameterType="Map" resultType="Map">
        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
        receivableAmount,SUM(t.received_amount) receivedAmount,SUM(t.owe_amount) oweAmount,max(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'
@@ -800,9 +802,9 @@

    <!-- 查询费用月统计信息 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
        select t.obj_name objName,t.fee_name feeName,t.fee_create_time feeCreateTime,max(t.deadline_time)
        deadlineTime,t.create_time createTime,SUM(t.receivable_amount) receivableAmount,SUM(t.received_amount)
        receivedAmount,SUM(t.owe_amount) oweAmount
        receivedAmount,SUM(t.owe_amount) oweAmount,max(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'
@@ -849,7 +851,7 @@
        <if test="endTime !=null">
            and t.create_time &lt;= #{endTime}
        </if>
        group by t.config_id,t.fee_name,t.fee_create_time,t.obj_id,t.obj_name,t.deadline_time
        group by t.config_id,t.fee_name,t.fee_create_time,t.obj_id,t.obj_name
        <if test="page != -1 and page != null ">
            limit #{page}, #{row}
        </if>