Refactor billing options retrieval to include data permissions and add effective date handling for product imports

2026-10-09 09:27:28 +08:00
parent fea34d1d10
commit c95a9861cc
42 changed files with 984 additions and 219 deletions
@@ -12,6 +12,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="feeName"    column="fee_name"    />
        <result property="scId"       column="sc_id"       />
        <result property="amount"     column="amount"      />
+        <result property="productAmount" column="product_amount" />
+        <result property="redlineAmount" column="redline_amount" />
        <result property="currency"   column="currency"    />
        <result property="roundMode"  column="round_mode"  />
        <result property="remark"     column="remark"      />
@@ -21,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    </resultMap>

    <select id="selectByBillId" parameterType="String" resultMap="PrcIncomeBillFeeResult">
-        select fee_id, bill_id, income_bill_id, fee_type, fee_name, sc_id, amount, currency, round_mode, remark,
+        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}
@@ -29,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    </select>

    <select id="selectByBillIds" resultMap="PrcIncomeBillFeeResult">
-        select fee_id, bill_id, income_bill_id, fee_type, fee_name, sc_id, amount, currency, round_mode, remark,
+        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 in
@@ -40,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    </select>

    <select id="selectUnbilledByBillIds" resultMap="PrcIncomeBillFeeResult">
-        select fee_id, bill_id, income_bill_id, fee_type, fee_name, sc_id, amount, currency, round_mode, remark,
+        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 ar_bill_status = #{arBillStatus}
@@ -52,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    </select>

    <select id="selectByFeeId" parameterType="String" resultMap="PrcIncomeBillFeeResult">
-        select fee_id, bill_id, income_bill_id, fee_type, fee_name, sc_id, amount, currency, round_mode, remark,
+        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 fee_id = #{feeId}
@@ -68,21 +70,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

    <insert id="insertPrcIncomeBillFee" parameterType="PrcIncomeBillFee">
        insert into prc_income_bill_fee (
-            fee_id, bill_id, income_bill_id, fee_type, fee_name, sc_id, amount, currency, round_mode, remark,
+            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
        ) values (
-            #{feeId}, #{billId}, #{incomeBillId}, #{feeType}, #{feeName}, #{scId}, #{amount}, #{currency}, #{roundMode}, #{remark},
+            #{feeId}, #{billId}, #{incomeBillId}, #{feeType}, #{feeName}, #{scId}, #{amount}, #{productAmount}, #{redlineAmount}, #{currency}, #{roundMode}, #{remark},
            #{arBillStatus}, #{manualFlag}, sysdate()
        )
    </insert>

    <insert id="insertBatch" parameterType="java.util.List">
        insert into prc_income_bill_fee (
-            fee_id, bill_id, income_bill_id, fee_type, fee_name, sc_id, amount, currency, round_mode, remark,
+            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
        ) values
        <foreach collection="list" item="item" separator=",">
            (#{item.feeId}, #{item.billId}, #{item.incomeBillId}, #{item.feeType}, #{item.feeName}, #{item.scId}, #{item.amount},
+             #{item.productAmount}, #{item.redlineAmount},
             #{item.currency}, #{item.roundMode}, #{item.remark},
             #{item.arBillStatus}, #{item.manualFlag}, sysdate())
        </foreach>
@@ -94,6 +97,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            fee_name = #{feeName},
            sc_id = #{scId},
            amount = #{amount},
+            product_amount = #{productAmount},
+            redline_amount = #{redlineAmount},
            currency = #{currency},
            round_mode = #{roundMode},
            remark = #{remark}