From 5032cf24132205aaca186da2b52ce99c98b1b45f Mon Sep 17 00:00:00 2001
From: zhaoqing <3160641494@qq.com>
Date: Wed, 12 Aug 2026 11:40:13 +0800
Subject: [PATCH] =?UTF-8?q?fix(bms):=E6=94=B6=E6=AC=BE=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/billManage/repository/po/BillManagePO.java    | 5 +++++
 mhd_bms/src/main/resources/mapper/BillManageMapper.xml   | 9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillManagePO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillManagePO.java
index a4c4e3403..9a3225e96 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillManagePO.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillManagePO.java
@@ -262,4 +262,9 @@ public class BillManagePO extends BaseVOEntity{
     @ApiModelProperty("收款帐户名称")
     private String paymentAccountName;
     private List<BillDetail> billDetailList;
+
+    @ApiModelProperty("最近收款时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Excel(name = "最近收款时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date collectionTime;
 }
\ No newline at end of file
diff --git a/mhd_bms/src/main/resources/mapper/BillManageMapper.xml b/mhd_bms/src/main/resources/mapper/BillManageMapper.xml
index 6be84c7ad..5c9b10211 100644
--- a/mhd_bms/src/main/resources/mapper/BillManageMapper.xml
+++ b/mhd_bms/src/main/resources/mapper/BillManageMapper.xml
@@ -8,7 +8,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="queryList" parameterType="com.mhd.bms.domain.billManage.repository.todo.BillManageDO" resultType="com.mhd.bms.domain.billManage.repository.po.BillManagePO">
         select
-               a.*,b.SETTLEMENT_ENTITY_ID as settlementEntityId
+               a.*,
+               b.SETTLEMENT_ENTITY_ID as settlementEntityId,
+               (SELECT MAX(c.collection_time)
+                FROM receipt_detail rd
+                LEFT JOIN receipt_manage c ON rd.receipt_manage_id = c.receipt_manage_id
+                WHERE rd.bill_manage_id = a.bill_manage_id
+                  AND rd.del_flag = 1
+                  AND c.del_flag = 1) AS collectionTime
         from bill_manage a LEFT JOIN SETTLEMENT_CUSTOMERS b on a.SETTLEMENT_CUSTOMERS_ID = b.SETTLEMENT_CUSTOMERS_ID
         where a.del_flag = 1
         <include refid="common_where"/>