From 1cd38d53f8e67f5dba868f113e25a2efd27ff1fe Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 24 Apr 2025 09:51:10 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisCommonController.java    | 25 ++++++++-----
 .../resources/mapper/EmisSettleBillMapper.xml | 36 +++++++++++--------
 2 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
index 39cbcffad..841f0b8cd 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
@@ -24,6 +24,7 @@ import com.xdadan.erp.common.utils.SecurityUtils;
 import com.xdadan.erp.emis.domain.*;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import com.xdadan.erp.emis.domain.stat.BillPayStatInfo;
+import com.xdadan.erp.emis.domain.stat.OpenBillStatInfo;
 import com.xdadan.erp.emis.domain.vo.AddressParseResult;
 import com.xdadan.erp.emis.service.*;
 import com.xdadan.erp.emis.service.kefu.RL7moorService;
@@ -1126,9 +1127,9 @@ public class EmisCommonController extends EmisBaseController
     @GetMapping("/autoDoGenerateNotifyTrigger")
     public AjaxResult autoDoSendNotifyTrigger() {
         // 0.催款,有超期回款的5分钟催一次
-        EmisSettleBill emisSettleBill=new EmisSettleBill();
-        emisSettleBill.getParams().put("isNeedRecdPay",1);
-        List<BillPayStatInfo> listExpireNoPayStatInfo = emisSettleBillService.selectBillPayStatInfoList(emisSettleBill);
+        EmisSettleBill queryRecBill=new EmisSettleBill();
+        queryRecBill.getParams().put("isNeedRecdPay",1);
+        List<BillPayStatInfo> listExpireNoPayStatInfo = emisSettleBillService.selectBillPayStatInfoList(queryRecBill);
         if(!CollectionUtils.isEmpty(listExpireNoPayStatInfo)){
             for (BillPayStatInfo item:listExpireNoPayStatInfo) {
                 String salesmen=item.getSalesmen();
@@ -1139,16 +1140,22 @@ public class EmisCommonController extends EmisBaseController
             }
         }
 
-
-
         // 1.销售开票统计通知
+        EmisSettleBill queryInvoice=new EmisSettleBill();
+        queryInvoice.getParams().put("isNeedRecdInvoice",1);
+        List<OpenBillStatInfo> listExpireNoInvoiceStatInfo = emisSettleBillService.selectOpenBillStatInfoList(queryInvoice);
+        if(!CollectionUtils.isEmpty(listExpireNoInvoiceStatInfo)){
+            for (OpenBillStatInfo item:listExpireNoInvoiceStatInfo) {
+                String salesmen=item.getSalesmen();
+                String billMonth=item.getBillMonth();
+                String msg="截止"+DateUtils.parseDateToStr("yyyy-MM-dd HH点",new Date())+"有账单未开票,尽快联系客户开票，账期:"+billMonth+",待收:"+item.getNoRecdPayMoney()+"元，超期:"+item.getExpiredNoRecdPayMoney()+"元!";
+                AjaxResult rst=NoticeUtils.outSendNoticeToInner(msg,msg,"/ruyERj/BillPaybackSumList",salesmen,3);
+                log.info(msg);
+            }
+        }
 
 
         // 2.开票收款统计通知
-
-
-//        sysNoticeService.
-
 //        if(empcodes!=null && empcodes.length>0) {
 //            for(int i=0;i<empcodes.length;i++){
 //                String empCode=empcodes[i];
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
index 59920106b..50b2d2059 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
@@ -273,17 +273,18 @@
 
 
     <select id="selectOpenBillStatInfoList" parameterType="EmisSettleBill" resultMap="OpenBillStatInfoResult">
-        select tba.salesmen,
-        tba.billMonth,
-        tba.totalBillCount,
-        tbb.hasOpenBillCount,
-        tbb.someOpenBillCount,
-        tbb.noOpenBillCount,
-        tbb.noNeedOpenBillCount,
+        select
+            tba.salesmen,
+            tba.billMonth,
+            tba.totalBillCount,
+            tbb.hasOpenBillCount,
+            tbb.someOpenBillCount,
+            tbb.noOpenBillCount,
+            tbb.noNeedOpenBillCount,
 
-        ifnull(tbc.normalOpenBillCount,0) as normalOpenBillCount,
-        ifnull(tbd.expiredOpenBillCount,0) as expiredOpenBillCount,
-        tbb.noOpenBillCount as expiredNoOpenBillCount
+            ifnull(tbc.normalOpenBillCount,0) as normalOpenBillCount,
+            ifnull(tbd.expiredOpenBillCount,0) as expiredOpenBillCount,
+            tbb.noOpenBillCount as expiredNoOpenBillCount
 
         from (
             select salesmen,bill_month as billMonth,
@@ -374,17 +375,22 @@
                 <if test="paymentStatus != null  and paymentStatus != ''"> and  a.payment_status = #{paymentStatus}</if>
                 <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                     and (
-                    a.salesmen=#{params.privEmpName}
-                    or  a.payee=#{params.privEmpName}
-                    or a.salesmen in(
-                    select salesmen from emis_salesmen_rel  esr where esr.del_flag='0' and esr.bl_open='1' and now() <![CDATA[ >= ]]> esr.start_date and now() <![CDATA[ <= ]]> esr.end_date and esr.sales_ass=#{params.privEmpName}
-                    )
+                        a.salesmen=#{params.privEmpName}
+                        or  a.payee=#{params.privEmpName}
+                        or a.salesmen in(
+                            select salesmen from emis_salesmen_rel  esr where esr.del_flag='0' and esr.bl_open='1' and now() <![CDATA[ >= ]]> esr.start_date and now() <![CDATA[ <= ]]> esr.end_date and esr.sales_ass=#{params.privEmpName}
+                        )
                     )
                 </if>
             </where>
             group by salesmen,bill_month
         ) tbd on tba.salesmen=tbd.salesmen and tba.billMonth=tbd.billMonth
 
+        where 1=1
+        <if test="params.isNeedRecdInvoice != null and params.isNeedRecdInvoice == 1">
+            and tbb.noOpenBillCount  <![CDATA[ > ]]>  0
+        </if>
+
     </select>