Implement batch fee management features in BillingController, including preview, submission, and task retrieval. Update related services and mappers to support batch processing. Add necessary error messages in properties file and enhance front-end API for batch operations.

2026-10-09 10:28:29 +08:00
parent 95df65b4f6
commit 5b4cbaffd6
15 changed files with 1014 additions and 23 deletions
@@ -60,6 +60,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        where fee_id = #{feeId}
    </select>

+    <select id="selectByBillIdAndFeeTypeAndScId" resultMap="PrcIncomeBillFeeResult">
+        select fee_id, bill_id, income_bill_id, fee_type, fee_name, sc_id, amount, product_amount, redline_amount, currency, round_mode, remark,
+               ar_bill_status, manual_flag, create_time
+        from prc_income_bill_fee
+        where bill_id = #{billId}
+          and fee_type = #{feeType}
+          and sc_id = #{scId}
+        limit 1
+    </select>
+
    <select id="countByBillIdAndArBillStatusAndFeeType" resultType="int">
        select count(1)
        from prc_income_bill_fee
@@ -101,7 +111,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            redline_amount = #{redlineAmount},
            currency = #{currency},
            round_mode = #{roundMode},
-            remark = #{remark}
+            remark = #{remark},
+            income_bill_id = #{incomeBillId},
+            manual_flag = #{manualFlag}
        where fee_id = #{feeId}
    </update>

@@ -240,6 +240,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="billId != null and billId != ''">
                AND p.bill_id = #{billId}
            </if>
+            <if test="billIds != null and billIds.size() > 0">
+                AND p.bill_id IN
+                <foreach collection="billIds" item="bid" open="(" separator="," close=")">
+                    #{bid}
+                </foreach>
+            </if>
            <if test="orderNo != null and orderNo != ''">
                AND p.order_no like concat('%', #{orderNo}, '%')
            </if>