欠费用户明细报表修改：只显示欠费用户有欠费的记录统计，欠费金额 = 预存帐户余额 - 实收欠费

iot-sysdatadocking/readme

@@ -0,0 +1 @@
+涉及到第三方系统对接

smart-city-platform/src/main/resources/mapper/pay/PayReportMapper.xml

@@ -166,22 +166,24 @@
     <select id="getPayArrearagedetailsReportList" resultType="com.bz.smart_city.dto.pay.PayArrearagedetailsReportDto">
 
         SELECT
-            pba.NAME as accountName,
-            pba.accountnumber as accountNumber,
-            pba.address as accountAddr,
-            pba.mobilephone as mobilePhone,
-            sum( CASE WHEN pprb.feetype = 1 THEN pprb.receivablefee ELSE 0 END ) as payamountFee,
-            sum( CASE WHEN pprb.feetype = 3 THEN pprb.receivablefee ELSE 0 END ) as taxExemptFee,
-            sum( CASE WHEN pprb.feetype = 4 THEN pprb.receivablefee ELSE 0 END ) as polluteFee,
-            sum( CASE WHEN pprb.feetype = 6 THEN pprb.receivablefee ELSE 0 END ) as penltyFee,
-            sum( CASE WHEN pprb.feetype = 1 THEN pprb.payamount ELSE 0 END ) payamount,
-            sum( CASE WHEN pprb.ladderlevel != 1 THEN pprb.receivablefee ELSE 0 END ) as outLevelFee,
-            sum( CASE WHEN pprb.receivablefee IS NULL THEN 0 ELSE pprb.receivablefee END ) as subtotal,
-            sum( CASE WHEN pprb.debt IS NULL THEN 0 ELSE pprb.debt END ) as debtFee
+        pba.NAME as accountName,
+        pba.accountnumber as accountNumber,
+        pba.address as accountAddr,
+        pba.mobilephone as mobilePhone,
+        sum( CASE WHEN pprb.feetype = 1 THEN pprb.receivablefee ELSE 0 END ) as payamountFee,
+        sum( CASE WHEN pprb.feetype = 3 THEN pprb.receivablefee ELSE 0 END ) as taxExemptFee,
+        sum( CASE WHEN pprb.feetype = 4 THEN pprb.receivablefee ELSE 0 END ) as polluteFee,
+        sum( CASE WHEN pprb.feetype = 6 THEN pprb.receivablefee ELSE 0 END ) as penltyFee,
+        sum( CASE WHEN pprb.feetype = 1 THEN pprb.payamount ELSE 0 END ) payamount,
+        sum( CASE WHEN pprb.ladderlevel != 1 THEN pprb.receivablefee ELSE 0 END ) as outLevelFee,
+        ppr.remaining - sum( CASE WHEN pprb.debt IS NULL THEN 0 ELSE pprb.debt END ) as subtotal,
+        sum( CASE WHEN pprb.debt IS NULL THEN 0 ELSE pprb.debt END ) as debtFee
         FROM
-            pay_pay_receivable pprb
-            LEFT JOIN pay_base_account pba ON pba.id = pprb.account_id
+        pay_pay_receivable pprb
+        LEFT JOIN pay_base_account pba ON pba.id = pprb.account_id
+        LEFT JOIN pay_pay_rechargeaccount ppr on ppr.account_id = pprb.account_id
         <where>
+            pprb.debt > 0
             <if test="customerId != null"> and pprb.customer_id = #{customerId}</if>
             <if test="siteId != null"> and pprb.site_id = #{siteId}</if>
             <if test="officeId != null"> and pprb.office_id = #{officeId}</if>
@@ -191,13 +193,11 @@
         </where>
 
         GROUP BY
-            pba.NAME,
-            pba.NAME,
-            pba.accountnumber,
-            pba.address,
-            pba.mobilephone
-        HAVING
-            sum( CASE WHEN pprb.debt IS NULL THEN 0 ELSE pprb.debt END )> 0
+        pba.NAME,
+        pba.accountnumber,
+        pba.address,
+        pba.mobilephone,
+        ppr.remaining
         ORDER BY accountnumber asc
     </select>
     <select id="getTranInfoReport" resultType="com.bz.smart_city.dto.pay.PayWaterPropertyReportDto">