Merge remote-tracking branch 'origin/master' into master

2026-01-15 11:35:40 +08:00
parent 70dd99d497 eb98e9e4bd
commit 355953940a
1 changed files with 2 additions and 2 deletions
@@ -133,11 +133,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

    <select id="getFeeList" parameterType="java.lang.String" resultType="java.util.Map">
        SELECT
-            SUBJECT_NAME,AMOUNT,RATE
+            SUBJECT_NAME,sum(AMOUNT) as AMOUNT
        FROM
            RECONCILIATION r left join RECONCILIATION_ACCOUNT acc on acc.RECONCILIATION_ID = r.RECONCILIATION_ID left join NGWL_TEST_WLHY.TMS_INVOICE_LIST tms on r.APPLY_NUMBER = tms.APPLY_NUMBER
        WHERE
-            tms.ID =  #{invoiceId}
+            tms.ID =  #{invoiceId} group by SUBJECT_NAME
    </select>

    <select id="queryInvoiceList" resultType="com.linke.finance.domain.businessDocument.repository.po.BusinessDocumentPO" parameterType="com.linke.finance.domain.businessDocument.repository.todo.BusinessDocumentDO">