From 1eb5a57b0acc963464dff945cb3b697a87d8a01e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Thu, 21 Oct 2021 17:16:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9#41229?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/mail/mapper/xml/PayMailBillMapper.xml     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
index 412e00f5..024171c2 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
@@ -50,7 +50,11 @@
         where pmbp.project_id=#{projectId}
     </select>
     <select id="getMonthMailCount" resultType="java.lang.Integer">
-        SELECT count(*) FROM pay_mail_bill WHERE DATE_FORMAT(create_time,'%Y-%m') = #{time} AND post_status = '1'
+        select count(*) from (
+        select id from pay_mail_bill WHERE DATE_FORMAT(create_time,'%Y-%m') = #{time} AND post_status = '1'
+        UNION ALL
+        select id from  pay_mail_contract WHERE DATE_FORMAT(create_time,'%Y-%m') = #{time} AND post_status = '1'
+        ) A
     </select>
 
     <select id="pageList" resultType="com.jero.mail.entity.PayMailBill">