1修改收费员明细表、收费明细表，去掉预存抵扣

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

@@ -20,6 +20,7 @@
         LEFT JOIN sc_user scu ON ppt.create_by = scu.id
         WHERE
         ppt.transtype =1 and (ppt.iscanceled = 0 or ppt.iscanceled is null) and ppt.canceledrecord_id is null
+        and ppt.payway !=5
         <if test="customerId != null">and ppt.customer_id = #{customerId}</if>
         <if test="siteId != null"> and ppt.site_id = #{siteId}</if>
         <if test ="officeId != null"> and ppt.office_id = #{officeId}</if>
@@ -65,6 +66,7 @@
         AND psd.site_id = #{siteId} AND psd.customer_id =  #{ customerId}
         WHERE
             ppt.canceledrecord_id IS NULL AND ( ppt.iscanceled = 0 OR ppt.iscanceled IS NULL )
+            and ppt.payway !=5
             <if test="customerId != null">and ppt.customer_id = #{customerId}</if>
             <if test="siteId != null"> and ppt.site_id = #{siteId}</if>
             <if test ="officeId != null"> and ppt.office_id = #{officeId}</if>
@@ -110,6 +112,7 @@
         LEFT JOIN pay_pay_transactiondetails ppt on ppt.payseriesno = ppr.payseriesno and ppt.transtype = 4
         <where>
             ppr.canceledrecord_id is null and ppr.iscanceled =0
+            and ppr.payway !=5
             <if test="customerId != null"> and ppr.customer_id = #{customerId}</if>
             <if test="siteId != null"> and ppr.site_id = #{siteId}</if>
             <if test="community != null and community != ''"> and scc.code = #{community,jdbcType=VARCHAR} </if>
@@ -137,6 +140,7 @@
         LEFT JOIN sc_community scc on scc.`code` = substring(ppt.accountnumber,1,3) and scc.`status`=1 and scc.customer_id =#{customerId}
         LEFT JOIN sc_user scu on scu.id = ppt.create_by
         WHERE ppt.canceledrecord_id is null and ppt.iscanceled =0 and ppt.transtype != 4 AND ppt.transtype != 2 and ppt.transamount>0
+        and ppt.payway !=5
         <if test="customerId != null"> and ppt.customer_id = #{customerId}</if>
         <if test="siteId != null"> and ppt.site_id = #{siteId}</if>
         <if test="community != null and community != ''"> and scc.code = #{community,jdbcType=VARCHAR} </if>