Merge remote-tracking branch 'origin/20210204' into 20210204

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

@@ -238,7 +238,7 @@
             max(amount.reading) as "reading",
             min(amount.lastreading) as "lastreading",
             max(reced.create_date) as "createDate",
-            sum(amount.payamount) as "payamount",
+            sum(case when rece.feetype = 1 then rece.payamount else 0 end )as "payamount",
             (select name from sc_user where id=max(reced.create_by)) as "createBy",
             (select  customer_name from sc_customer where id=max(reced.customer_id)) as "customerName"
         from pay_pay_received reced
@@ -410,7 +410,7 @@
         select
         amount.account_id
         ,ifnull(sum(rece.receivablefee),0) receivablefee
-        ,ifnull(sum(amount.payamount),0) payamount
+        ,ifnull(sum(case when rece.feetype = 1 then rece.payamount else 0 end ),0) payamount
         ,ifnull(min(amount.lastreading),0) lastreading
         ,ifnull(min(amount.lastrecorddate),0) lastrecorddate
         ,ifnull(max(amount.reading),0) reading
@@ -458,7 +458,7 @@
     <select id="getPayInvoiceReceivable" resultType="com.bz.smart_city.dto.pay.payfee.PrintInvoiceData">
         select
             rec.account_id
-            ,sum(case when rec.feetype = 1 then rec.receivablefee else 0 end ) payamount
+            ,sum(case when rec.feetype = 1 then rec.payamount else 0 end ) payamount
             ,max(case when rec.feetype = 1 and rec.ladderlevel =1 then rec.waterbasicprice else 0 end ) price1
             ,sum(case when rec.feetype = 1 then rec.receivablefee else 0 end ) receivablefee1
             ,max(case when rec.feetype = 3 and rec.ladderlevel =1 then rec.waterbasicprice else 0 end ) price3