月度汇总视图查询接口;

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}