From e2bee47aacc7df68a2c88464c86978faea15820b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Wed, 9 Sep 2026 14:31:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E5=BA=A6=E6=B1=87=E6=80=BB=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/BillManageMapper.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mhd_bms/src/main/resources/mapper/BillManageMapper.xml b/mhd_bms/src/main/resources/mapper/BillManageMapper.xml
index a182856f8..e99c7a7f3 100644
--- a/mhd_bms/src/main/resources/mapper/BillManageMapper.xml
+++ b/mhd_bms/src/main/resources/mapper/BillManageMapper.xml
@@ -31,25 +31,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             b.SETTLEMENT_ENTITY AS settlementEntityName,
             a.ORGANIZATION_ID AS organizationId,
             a.ORGANIZATION_NAME AS organizationName,
-            DATE_FORMAT(a.CREATE_TIME, '%Y-%m') AS billMonth,
+            TO_CHAR(a.CREATE_TIME, 'YYYY-MM') AS billMonth,
             SUM(a.BILL_AMOUNT) AS totalBillAmount,
-            SUM(IFNULL(a.BILL_AMOUNT_SETTLEMENT, 0)) AS totalSettledAmount,
-            SUM(IFNULL(a.BILL_AMOUNT_UNSETTLED, 0)) AS totalUnsettledAmount,
+            SUM(NVL(a.BILL_AMOUNT_SETTLEMENT, 0)) AS totalSettledAmount,
+            SUM(NVL(a.BILL_AMOUNT_UNSETTLED, 0)) AS totalUnsettledAmount,
             COUNT(*) AS billCount,
-            GROUP_CONCAT(a.BILL_MANAGE_ID) AS billManageIds,
+            LISTAGG(a.BILL_MANAGE_ID, ',') WITHIN GROUP (ORDER BY a.BILL_MANAGE_ID) AS billManageIds,
             b.SETTLEMENT_METHOD AS settlementMethod,
             b.SETTLEMENT_CURRENCY AS settlementCurrency
         FROM bill_manage a
         LEFT JOIN SETTLEMENT_CUSTOMERS b ON a.SETTLEMENT_CUSTOMERS_ID = b.SETTLEMENT_CUSTOMERS_ID AND b.del_flag = 1
         WHERE a.del_flag = 1
         <include refid="common_where"/>
-        GROUP BY a.SETTLEMENT_CUSTOMERS_ID, DATE_FORMAT(a.CREATE_TIME, '%Y-%m')
-        ORDER BY a.CREATE_TIME DESC
+        GROUP BY a.SETTLEMENT_CUSTOMERS_ID, TO_CHAR(a.CREATE_TIME, 'YYYY-MM'), a.ORGANIZATION_ID, a.ORGANIZATION_NAME, b.SETTLEMENT_ENTITY_ID, b.SETTLEMENT_ENTITY, b.SETTLEMENT_METHOD, b.SETTLEMENT_CURRENCY, a.SETTLEMENT_CUSTOMERS_CODE, a.SETTLEMENT_ENTITY
+        ORDER BY MAX(a.CREATE_TIME) DESC
     </select>
 
     <sql id="common_where">
         <if test="billManageDO.billMonth != null and billManageDO.billMonth != ''">
-            AND DATE_FORMAT(a.CREATE_TIME, '%Y-%m') = #{billManageDO.billMonth}
+            AND TO_CHAR(a.CREATE_TIME, 'YYYY-MM') = #{billManageDO.billMonth}
         </if>
         <if test="billManageDO.createTimeStart != null and billManageDO.createTimeStart != ''">
             AND date_format(a.create_time,'%Y-%m-%d') <![CDATA[>=]]> #{billManageDO.createTimeStart}