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

smart-city-platform/src/main/java/com/bz/smart_city/dao/pay/PayReportMapper.java

@@ -15,11 +15,9 @@ import java.util.List;
 public interface PayReportMapper {
 
     List<PayTransactiondetailsReportDto>getPayTransactiondetailsReportList(PayTransactiondetailsReportDto inParams);
-    PayTransactiondetailsReportDto getPayTransactiondetailsReportCount(PayTransactiondetailsReportDto inParams);
 
     List<PayOperatordetailsReportDto>getPayOperatordetailsReportList(PayOperatordetailsReportDto inParams);
-    PayOperatordetailsReportDto getPayOperatordetailsReportCount(PayOperatordetailsReportDto inParams);
 
     List<PayArrearagedetailsReportDto>getPayArrearagedetailsReportList(PayArrearagedetailsReportDto inParams);
-    PayArrearagedetailsReportDto getPayArrearagedetailsReportCount(PayArrearagedetailsReportDto inParams);
+
 }

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/pay/PayInvoiceServiceImpl.java

@@ -117,7 +117,7 @@ public class PayInvoiceServiceImpl implements PayinvoiceService {
 
         for(PayTransactiondetails payTransactiondetails:payTransactiondetailsList){
             //转预存或充值金额
-            if(payTransactiondetails.getPayway()!=4&&(payTransactiondetails.getTranstype()==1||payTransactiondetails.getTranstype()==4)){
+            if(payTransactiondetails.getPayway()!=5&&(payTransactiondetails.getTranstype()==1||payTransactiondetails.getTranstype()==4)){
                 countReceivedamount = countReceivedamount.add(payTransactiondetails.getTransamount()!=null?payTransactiondetails.getTransamount():BigDecimal.ZERO);
 
                 invoice.setAccountId(payTransactiondetails.getAccountId());
@@ -133,7 +133,7 @@ public class PayInvoiceServiceImpl implements PayinvoiceService {
 
         for(PayPayReceived received:Receiveds){
             //非预存划扣（即支付金额抵扣）
-            if(received.getPayway()!=4){
+            if(received.getPayway()!=5){
                 countReceivedamount = countReceivedamount.add(received.getReceivedamount()!=null?received.getReceivedamount():BigDecimal.ZERO);
 
                 invoice.setAccountId(received.getAccountId());

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/pay/PayReportServiceImpl.java

@@ -44,10 +44,18 @@ public class PayReportServiceImpl implements PayReportService {
 
         PageHelper.startPage(pageNum, pageSize);
         List<PayTransactiondetailsReportDto> reList = payReportMapper.getPayTransactiondetailsReportList(payTransactiondetailsReportDto);
-        PayTransactiondetailsReportDto subDto = payReportMapper.getPayTransactiondetailsReportCount(payTransactiondetailsReportDto);
-        if(reList != null && reList.size() > 0)
-            if(subDto != null)
-                reList.add(0,subDto);
+
+        if(reList != null && reList.size() > 0){
+            PayTransactiondetailsReportDto subDto = new PayTransactiondetailsReportDto();
+            BigDecimal transAmount = BigDecimal.ZERO;
+            for(int i=0;i<reList.size();i++){
+                transAmount = transAmount.add(reList.get(i).getTransAmount());
+            }
+            subDto.setTransAmount(transAmount);
+            subDto.setAccountNumber("合计");
+            reList.add(0,subDto);
+        }
+
 
         return new Pagination<>(reList);
     }
@@ -72,10 +80,23 @@ public class PayReportServiceImpl implements PayReportService {
 
         PageHelper.startPage(pageNum,pageSize);
         List<PayOperatordetailsReportDto> reList = payReportMapper.getPayOperatordetailsReportList(payOperatordetailsReportDto);
-        PayOperatordetailsReportDto subDto = payReportMapper.getPayOperatordetailsReportCount(payOperatordetailsReportDto);
-        if(reList != null && reList.size() > 0)
-            if(subDto != null)
-                reList.add(0,subDto);
+        if(reList != null && reList.size() > 0){
+            PayOperatordetailsReportDto subDto = new PayOperatordetailsReportDto();
+            BigDecimal receivedCount = BigDecimal.ZERO;
+            BigDecimal transamount = BigDecimal.ZERO;
+            BigDecimal subtotal = BigDecimal.ZERO;
+            for(int i=0;i<reList.size();i++){
+                receivedCount = receivedCount.add(reList.get(i).getReceivedCount());
+                transamount = transamount.add(reList.get(i).getTransamount());
+                subtotal = subtotal.add(reList.get(i).getSubtotal());
+            }
+            subDto.setSubtotal(subtotal);
+            subDto.setTransamount(transamount);
+            subDto.setReceivedCount(receivedCount);
+            subDto.setAccountName("合计");
+            reList.add(0,subDto);
+        }
+
         return new Pagination<>(reList);
     }
 
@@ -97,10 +118,35 @@ public class PayReportServiceImpl implements PayReportService {
 
         PageHelper.startPage(pageNum,pageSize);
         List<PayArrearagedetailsReportDto> reList = payReportMapper.getPayArrearagedetailsReportList(payArrearagedetailsReportDto);
-        PayArrearagedetailsReportDto subDto = payReportMapper.getPayArrearagedetailsReportCount(payArrearagedetailsReportDto);
-        if(reList != null && reList.size() > 0)
-            if(subDto != null)
-                reList.add(0,subDto);
+        if(reList != null && reList.size() > 0){
+            PayArrearagedetailsReportDto subDto = new PayArrearagedetailsReportDto();
+            Integer payamount = 0;
+            BigDecimal payamountFee = BigDecimal.ZERO;
+            BigDecimal polluteFee= BigDecimal.ZERO;
+            BigDecimal taxExemptFee= BigDecimal.ZERO;
+            BigDecimal penltyFee= BigDecimal.ZERO;
+            BigDecimal outLevelFee= BigDecimal.ZERO;
+            BigDecimal subtotal= BigDecimal.ZERO;
+            for(int i=0;i<reList.size();i++){
+                payamount = payamount + reList.get(i).getPayamount();
+                payamountFee = payamountFee.add(reList.get(i).getPayamountFee());
+                polluteFee = polluteFee.add(reList.get(i).getPolluteFee());
+                taxExemptFee = taxExemptFee.add(reList.get(i).getTaxExemptFee());
+                penltyFee = penltyFee.add(reList.get(i).getPenltyFee());
+                outLevelFee = outLevelFee.add(reList.get(i).getOutLevelFee());
+                subtotal = subtotal.add(reList.get(i).getSubtotal());
+            }
+            subDto.setPayamount(payamount);
+            subDto.setPayamountFee(payamountFee);;
+            subDto.setPolluteFee(polluteFee);
+            subDto.setTaxExemptFee(taxExemptFee);
+            subDto.setPenltyFee(penltyFee);
+            subDto.setOutLevelFee(outLevelFee);
+            subDto.setSubtotal(subtotal);
+            subDto.setAccountNumber("合计");
+            reList.add(0,subDto);
+        }
+
         return new Pagination<>(reList);
     }
 

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

@@ -236,6 +236,7 @@
         from (
             select
             a.account_id as "accountId",
+            re.feetype,
             re.feetypename,
             re.ladderlevel,
             (case when re.ladderlevel = 1 then '一阶'
@@ -255,6 +256,7 @@
             union all
             select
             a.account_id,
+            re.feetype,
             re.feetypename,
             '' as "ladderlevel",
             '' as "ladderlevelname",
@@ -268,7 +270,7 @@
             where  re.feetype !=1  and a.`year`*12+a.`month` >= #{minPeriod} and a.`year`*12+a.`month` <= #{maxPeriod} and  a.account_id=#{accountId}
             group by  a.account_id,re.feetypename
         )s
-        order by s.accountId,s.feetypename,s.ladderlevel
+        order by s.accountId,s.feetype,s.ladderlevel
     </select>
     
     <select id="getPayfeeRemainingPrint"  resultType="com.bz.smart_city.dto.pay.payfee.PrintInvoiceData">

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

@@ -2,26 +2,25 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.bz.smart_city.dao.pay.PayReportMapper">
     <select id="getPayTransactiondetailsReportList" resultType="com.bz.smart_city.dto.pay.PayTransactiondetailsReportDto">
-    SELECT
+    SELECT * FROM (
+        SELECT
         ppt.accountnumber as accountNumber,
         ppt.accountname as accountName,
         ppt.transamount as transAmount,
         ppt.transtime as transTime,
         ppt.create_by as createBy,
         ppt.office_id as officeId,
-        ppt.transtype as transTypee,
-        ppt.transtypelabel as transTypeLabel,
         ppt.payway as payWay,
         ppt.paywayLabel as paywayLabel,
         scu.NAME as createByName,
         ppa.address as accountAddr
-    FROM
+        FROM
         pay_pay_transactiondetails ppt
         LEFT JOIN pay_base_account ppa ON ppt.accountnumber = ppa.accountnumber
         LEFT JOIN sc_user scu ON ppt.create_by = scu.id
-    WHERE
+        WHERE
         ppt.transtype =1 and (ppt.iscanceled = 0 or ppt.iscanceled is null) and ppt.canceledrecord_id is null
-        <if test="customerId != null"> and ppt.customer_id = #{customerId}</if>
+        <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>
         <if test="createBy != null"> and ppt.create_by = #{createBy}</if>
@@ -29,31 +28,67 @@
         <if test="endTime != null"> and ppt.transtime &lt;= #{endTime,jdbcType=TIMESTAMP}</if>
         <if test="payWay != null"> and ppt.payway = #{payWay}</if>
 
-    order by ppt.transtime desc
-
-    </select>
+        UNION ALL
 
-    <select id="getPayTransactiondetailsReportCount" resultType="com.bz.smart_city.dto.pay.PayTransactiondetailsReportDto">
         SELECT
-        '合计' as accountNumber,
-        SUM(ppt.transamount) as transAmount
+        tab.accountnumber,
+        tab.accountname,
+        tab.transamount +(
+        SELECT ifnull( sum( trans.transamount ), 0 ) FROM pay_pay_transactiondetails trans
+        WHERE trans.payseriesno = tab.payseriesno AND transtype != 2) transamount,
+        tab.transtime,
+        tab.createBy,
+        tab.officeId,
+        tab.payway,
+        tab.paywayLabel,
+        tab.createByName,
+        tab.accountAddr
         FROM
-        pay_pay_transactiondetails ppt
-        LEFT JOIN pay_base_account ppa ON ppt.accountnumber = ppa.accountnumber
-        LEFT JOIN sc_user scu ON ppt.create_by = scu.id
+    (
+        SELECT
+        ppt.accountnumber AS accountNumber,
+        ppt.accountname AS accountName,
+        sum( ppt.receivedamount ) AS transamount,
+        max( ppt.create_date ) AS transTime,
+        ppt.create_by AS createBy,
+        ppt.office_id AS officeId,
+        ppt.payway AS payWay,
+        psd.label AS paywayLabel,
+        scu.NAME AS createByName,
+        ppa.address AS accountAddr,
+        ppt.payseriesno
+        FROM
+        pay_pay_received ppt
+        INNER JOIN pay_base_account ppa ON ppt.accountnumber = ppa.accountnumber
+        INNER JOIN sc_user scu ON ppt.create_by = scu.id
+        INNER JOIN pay_sys_dict psd ON psd.VALUE = ppt.payway AND psd.type = '支付方式'
+        AND psd.site_id = #{siteId} AND psd.customer_id =  #{ customerId}
         WHERE
-        ppt.transtype =1 and (ppt.iscanceled = 0 or ppt.iscanceled is null) and ppt.canceledrecord_id is null
-        <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>
-        <if test="createBy != null"> and ppt.create_by = #{createBy}</if>
-        <if test="beginTime != null"> and ppt.transtime >= #{beginTime,jdbcType=TIMESTAMP}</if>
-        <if test="endTime != null"> and ppt.transtime &lt;= #{endTime,jdbcType=TIMESTAMP}</if>
-        <if test="payWay != null"> and ppt.payway = #{payWay}</if>
+            ppt.canceledrecord_id IS NULL AND ( ppt.iscanceled = 0 OR ppt.iscanceled IS NULL )
+            <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>
+            <if test="createBy != null"> and ppt.create_by = #{createBy}</if>
+            <if test="beginTime != null"> and ppt.create_date >= #{beginTime,jdbcType=TIMESTAMP}</if>
+            <if test="endTime != null"> and ppt.create_date &lt;= #{endTime,jdbcType=TIMESTAMP}</if>
+            <if test="payWay != null"> and ppt.payway = #{payWay}</if>
+        GROUP BY
+            ppt.accountnumber,
+            ppt.accountname,
+            ppt.create_by,
+            ppt.office_id,
+            ppt.payway,
+            psd.label,
+            scu.NAME,
+            ppa.address,
+            ppt.payseriesno
+    ) tab
+        )a order by transtime desc
 
 
     </select>
 
+
     <select id="getPayOperatordetailsReportList" resultType="com.bz.smart_city.dto.pay.PayOperatordetailsReportDto">
     SELECT * from
     (
@@ -83,6 +118,31 @@
 
         </where>
         GROUP BY pba.`name`,pba.accountnumber,pba.address,scc.`name`
+        union all
+
+        SELECT
+            pba.`name` as accountName,
+            pba.accountnumber as accountNumber,
+            pba.address as accountAddr,
+            scc.`name` communityName,
+            0 as receivedCount,
+            sum(ppt.transamount) transamount,
+            sum(ppt.transamount) subtotal,
+            min(ppt.create_date) transTime,
+            min(scu.`name`) createByName
+        FROM pay_pay_transactiondetails ppt
+        LEFT JOIN pay_base_account pba on ppt.account_id = pba.id
+        LEFT JOIN sc_community scc on scc.`code` = substring(ppt.accountnumber,1,3)
+        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
+        <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>
+        <if test="createBy != null"> and ppt.create_by = #{createBy} </if>
+        <if test="beginTime != null"> and ppt.create_date >= #{beginTime,jdbcType=TIMESTAMP}</if>
+        <if test="endTime != null"> and ppt.create_date &lt;= #{endTime,jdbcType=TIMESTAMP}</if>
+        GROUP BY pba.`name`,pba.accountnumber,pba.address,scc.`name`
+
     ) tb
     <where>
         <if test="dataType != null and subtotal != null">
@@ -93,54 +153,11 @@
         </if>
     </where>
 
-    </select>
-
-    <select id="getPayOperatordetailsReportCount" resultType="com.bz.smart_city.dto.pay.PayOperatordetailsReportDto">
-        SELECT
-            '合计' as accountName,
-            sum(receivedCount) receivedCount,
-            sum(transamount) transamount,
-            sum(subtotal) subtotal
-        from
-        (
-        SELECT
-        pba.`name` as accountName,
-        pba.accountnumber as accountNumber,
-        pba.address as accountAddr,
-        scc.`name` communityName,
-        SUM(ppr.receivedamount) receivedCount,
-        max(ifnull(ppt.transamount,0)) transamount,
-        sum(ppr.receivedamount)  + max(ifnull(ppt.transamount,0))  subtotal,
-        min(ppr.create_date) transTime,
-        min(scu.`name`) createByName
-        FROM pay_pay_received ppr
-        LEFT JOIN pay_base_account pba on ppr.account_id = pba.id
-        LEFT JOIN sc_community scc on scc.`code` = substring(pba.accountnumber,1,3) and scc.customer_id = 47
-        LEFT JOIN sc_user scu on scu.id = ppr.create_by
-        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
-            <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>
-            <if test="createBy != null"> and ppr.create_by = #{createBy} </if>
-            <if test="beginTime != null"> and ppr.create_date >= #{beginTime,jdbcType=TIMESTAMP}</if>
-            <if test="endTime != null"> and ppr.create_date &lt;= #{endTime,jdbcType=TIMESTAMP}</if>
-
-        </where>
-        GROUP BY pba.`name`,pba.accountnumber,pba.address,scc.`name`
-        ) tb
-        <where>
-            <if test="dataType != null and subtotal != null">
-                <if test="dataType == 0"> subtotal = #{subtotal}</if>
-                <if test="dataType == 1"> subtotal &lt; #{subtotal}</if>
-                <if test="dataType == 2"> subtotal > #{subtotal}</if>
-
-            </if>
-        </where>
+    order by transtime desc
 
     </select>
 
+
     <select id="getPayArrearagedetailsReportList" resultType="com.bz.smart_city.dto.pay.PayArrearagedetailsReportDto">
 
         SELECT
@@ -179,55 +196,5 @@
 
     </select>
 
-    <select id="getPayArrearagedetailsReportCount" resultType="com.bz.smart_city.dto.pay.PayArrearagedetailsReportDto">
-
-        SELECT
-            '合计' as accountName,
-            sum(payamount) as payamount,
-            sum(payamountFee) as payamountFee,
-            sum(taxExemptFee) as taxExemptFee,
-            sum(polluteFee) as polluteFee,
-            sum(penltyFee) as penltyFee,
-            sum(outLevelFee) as outLevelFee,
-            sum(subtotal) as subtotal,
-            sum(debtFee) as debtFee
-        FROM
-        (
-            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
-            FROM
-            pay_pay_receivable pprb
-            LEFT JOIN pay_base_account pba ON pba.id = pprb.account_id
-            <where>
-                <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>
-                <if test="community != null and community != ''"> and substring(pba.accountnumber,1,3) = #{community,jdbcType=VARCHAR}</if>
-                <if test="accountNumber != null and accountNumber != ''"> and pba.accountnumber like concat('%',#{accountNumber},'%')</if>
-
-            </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
-        ) tb
-
-    </select>
 
 </mapper>