From 9fe8760a090ff1e6b0bbb694e9c4dc6431bb3b1e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 15 May 2025 19:52:58 +0800
Subject: [PATCH] md

---
 .../impl/EmisTmsSiteBatchMissServiceImpl.java |  2 ++
 .../resources/mapper/EmisSettleBillMapper.xml | 28 ++++++++++++++-----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java
index 971a547d0..0f4921504 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java
@@ -14,6 +14,7 @@ import com.xdadan.erp.emis.service.EmisBaseService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.xdadan.erp.emis.service.IEmisTmsSiteBatchMissService;
 
@@ -119,6 +120,7 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements
         return emisTmsSiteBatchMissMapper.deleteEmisTmsSiteBatchMissById(id);
     }
 
+    @Async
     @Override
     public void autoScanSiteBatch() {
         try {
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
index f9fdc6542..79d7a589d 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
@@ -111,6 +111,18 @@
 
     </resultMap>
 
+    <!-- 按月统计-->
+    <select id="queryBillPayMonthList" parameterType="EmisSettleBill" resultType="map">
+        SELECT
+            bill_month as billMonth,
+            round(sum(rec_money),2) as recMoney,
+            round(sum(reced_money),2) as recedMoney,
+            (round(sum(rec_money),2)-round(sum(reced_money),2) ) as noRecedMoney
+        FROM emis_settle_bill
+        WHERE del_flag = '0'
+        GROUP BY bill_month
+        ORDER BY bill_month
+    </select>
 
     <!-- 收款统计-PMS需求:379-->
     <select id="queryPayBackStatList" parameterType="EmisSettleBill" resultType="map">
@@ -187,6 +199,13 @@
                             and espr.trade_date <![CDATA[ >= ]]>  #{params.beginTradeDate}
                         )
                     </if>
+                    <if test="params.endTradeDate != null and params.endTradeDate != ''">
+                        and exists (
+                        select 1 from emis_settle_pay_record espr,emis_settle_pay_bill_rel espbr
+                        where espr.del_flag='0' and espbr.del_flag='0' and a.settle_bill_no=espr.settle_bill_no and  espr.pay_id = espbr.pay_id
+                        and espr.trade_date <![CDATA[ <= ]]>  #{params.endTradeDate}
+                        )
+                    </if>
                     <if test="params.payCreateBy != null and params.payCreateBy != ''">
                         and exists (
                         select 1 from emis_settle_pay_record espr,emis_settle_pay_bill_rel espbr
@@ -194,13 +213,7 @@
                         and espr.create_by = #{params.payCreateBy}
                         )
                     </if>
-                    <if test="params.endTradeDate != null and params.endTradeDate != ''">
-                        and exists (
-                            select 1 from emis_settle_pay_record espr,emis_settle_pay_bill_rel espbr
-                            where espr.del_flag='0' and espbr.del_flag='0' and a.settle_bill_no=espr.settle_bill_no and  espr.pay_id = espbr.pay_id
-                            and espr.trade_date <![CDATA[ <= ]]>  #{params.endTradeDate}
-                        )
-                    </if>
+
                     <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                         and (
                             a.salesmen=#{params.privEmpName}
@@ -215,6 +228,7 @@
         LEFT JOIN (
             SELECT
                 a.settle_bill_no,
+                sum( b.pay_money) AS totalPayMoney,
                 sum( if( b.trade_date <![CDATA[ <= ]]>  a.payment_due_date,b.pay_money,0)  ) AS recdMoneyIn,
                 sum( if(b.trade_date <![CDATA[ > ]]> a.payment_due_date and b.trade_date <![CDATA[ <= ]]>  DATE_SUB( a.payment_due_date, INTERVAL - 30 DAY ),b.pay_money,0)  ) AS recdPayMoney60D,
                 sum( if(b.trade_date <![CDATA[ > ]]> DATE_SUB( a.payment_due_date, INTERVAL - 30 DAY ),b.pay_money,0)  ) AS recdPayMoneyGreat60D