From 4c3dffe8fb1f393d80c6ba46ce22d3cc800b2692 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 27 Dec 2024 11:18:41 +0800
Subject: [PATCH] md

---
 .../main/java/com/xdadan/erp/web/emis/EmisCommonController.java | 2 +-
 emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 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 c704ed989..5bd4fb163 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
@@ -1065,7 +1065,7 @@ public class EmisCommonController extends EmisBaseController
             for (BillPayStatInfo item:listExpireNoPayStatInfo) {
                 String salesmen=item.getSalesmen();
                 String billMonth=item.getBillMonth();
-                String msg="有未回款,尽快联系客户收款，账期:"+billMonth+",待收:"+item.getNoRecdPayMoney()+"元，超期:"+item.getExpiredNoRecdPayMoney()+"元!";
+                String msg=DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,new Date())+"-有未回款,尽快联系客户收款，账期:"+billMonth+",待收:"+item.getNoRecdPayMoney()+"元，超期:"+item.getExpiredNoRecdPayMoney()+"元!";
                 NoticeUtils.outSendNoticeToInner(msg,msg,"/ruyERj/BillPaybackSumList",salesmen,3);
             }
         }
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
index 403b0615a..76fc29153 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
@@ -262,10 +262,10 @@
             where 1=1
                 <!-- 超期回款 -->
                 <if test="params.isNeedRecdPay != null and params.isNeedRecdPay=1 ">
+                    tba.totalNoRecdPayMoney <![CDATA[ >= ]]>  0 and
                     and ( expiredNoRecdPayMoney <![CDATA[ >= ]]>  0 or noRecdPayMoney <![CDATA[ >= ]]>  0 )
                 </if>
 
-
     </select>