应付配置文件导入保存该文件

2026-11-05 10:31:02 +08:00
parent 51a89b18e1
commit 116b3b74e4
21 changed files with 557 additions and 31 deletions
@@ -122,6 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    <update id="updateServiceChannel" parameterType="com.bms.masterdata.domain.ServiceChannel">
        update srv_service_channel
        set channel_code = #{channelCode},
+
            channel_name = #{channelName},
            service_code = #{serviceCode},
            service_name = #{serviceName},
@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="sheetName" column="sheet_name"/>
        <result property="relatedSheet" column="related_sheet"/>
        <result property="sourceFile" column="source_file"/>
+        <result property="filePath" column="file_path"/>
        <result property="fileMd5" column="file_md5"/>
        <result property="supplierName" column="supplier_name"/>
        <result property="effectiveDate" column="effective_date"/>
@@ -112,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
               ifnull(cur.extra_per_kg, pay_product.extra_per_kg) as extra_per_kg, pay_product.service_type,
               pay_product.classification, pay_product.catalog_remark, pay_product.update_content, pay_product.weight_limit,
               pay_product.sheet_name, pay_product.related_sheet, ifnull(cur.source_file, pay_product.source_file) as source_file,
+               case when cur.product_id is null then pay_product.file_path else cur.file_path end as file_path,
               pay_product.file_md5,
               pay_product.supplier_name, pay_product.effective_date, ifnull(cur.currency, pay_product.currency) as currency,
               pay_product.service_note,
@@ -137,7 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

    <select id="selectPayProductById" parameterType="long" resultMap="PayProductResult">
        select product_id, product_name, product_type, dict_value, origin_id, channel_id, version_no, country_scope, charge_type, extra_per_kg, service_type,
-               classification, catalog_remark, update_content, weight_limit, sheet_name, related_sheet, source_file,
+               classification, catalog_remark, update_content, weight_limit, sheet_name, related_sheet, source_file, file_path,
               file_md5, supplier_name, effective_date, currency, service_note, parse_status, weight_count,
               surcharge_count, extra_count, created_by, create_time, updated_by, update_time, remark
        from pay_product
@@ -153,13 +155,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    <insert id="insertPayProduct" parameterType="com.bms.price.domain.PayProduct" useGeneratedKeys="true" keyProperty="productId">
        insert into pay_product (
            product_name, product_type, dict_value, origin_id, channel_id, version_no, country_scope, charge_type, extra_per_kg, service_type, classification,
-            catalog_remark, update_content, weight_limit, sheet_name, related_sheet, source_file, file_md5,
+            catalog_remark, update_content, weight_limit, sheet_name, related_sheet, source_file, file_path, file_md5,
            supplier_name, effective_date, currency, service_note, parse_status, weight_count, surcharge_count,
            extra_count, created_by, create_time, remark
        ) values (
            #{productName}, #{productType}, #{dictValue}, #{originId}, #{channelId}, ifnull(#{versionNo}, 1), #{countryScope}, #{chargeType}, #{extraPerKg},
            #{serviceType}, #{classification}, #{catalogRemark}, #{updateContent}, #{weightLimit}, #{sheetName},
-            #{relatedSheet}, #{sourceFile}, #{fileMd5}, #{supplierName}, #{effectiveDate}, #{currency},
+            #{relatedSheet}, #{sourceFile}, #{filePath}, #{fileMd5}, #{supplierName}, #{effectiveDate}, #{currency},
            #{serviceNote}, #{parseStatus}, #{weightCount}, #{surchargeCount}, #{extraCount}, #{createBy}, sysdate(),
            #{remark}
        )
@@ -184,6 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            sheet_name = #{sheetName},
            related_sheet = #{relatedSheet},
            source_file = #{sourceFile},
+            file_path = #{filePath},
            file_md5 = #{fileMd5},
            supplier_name = #{supplierName},
            effective_date = #{effectiveDate},
@@ -246,12 +249,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

    <insert id="insertSurcharges">
        insert into pay_surcharge (
-            product_id, version_no, section_name, fee_name, zone_name, charge_text, amount, currency, fee_desc, period_text,
+            product_id, version_no, section_name, fee_name, zone_name, charge_text, amount, currency, price_unit, fee_desc, period_text,
            effective_start, effective_end, charge_timing, calc_rule, calc_param, sort_no
        ) values
        <foreach collection="list" item="row" separator=",">
            (#{row.productId}, ifnull(#{row.versionNo}, 1), #{row.sectionName}, #{row.feeName}, #{row.zoneName}, #{row.chargeText}, #{row.amount},
-             #{row.currency}, #{row.feeDesc}, #{row.periodText}, #{row.effectiveStart}, #{row.effectiveEnd},
+             #{row.currency}, #{row.priceUnit}, #{row.feeDesc}, #{row.periodText}, #{row.effectiveStart}, #{row.effectiveEnd},
             #{row.chargeTiming}, ifnull(#{row.calcRule}, 'MANUAL'), #{row.calcParam}, #{row.sortNo})
        </foreach>
    </insert>
@@ -275,7 +278,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

    <select id="selectSurcharges" resultType="com.bms.price.domain.PaySurcharge">
        select surcharge_id as surchargeId, product_id as productId, version_no as versionNo, section_name as sectionName, fee_name as feeName,
-               zone_name as zoneName, charge_text as chargeText, amount, currency, fee_desc as feeDesc,
+               zone_name as zoneName, charge_text as chargeText, amount, currency, price_unit as priceUnit, fee_desc as feeDesc,
               period_text as periodText, effective_start as effectiveStart, effective_end as effectiveEnd,
               charge_timing as chargeTiming, calc_rule as calcRule, calc_param as calcParam, sort_no as sortNo
        from pay_surcharge
@@ -8,7 +8,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        select t.term_id as termId, t.dict_value as dictValue, t.product_id as productId, t.version_no as versionNo,
               t.effective_start as effectiveStart, t.effective_end as effectiveEnd, t.status,
               t.created_by as createBy, t.create_time as createTime, t.remark,
-               p.product_name as productName, p.source_file as sourceFile, p.weight_count as weightCount,
+               p.product_name as productName, p.source_file as sourceFile,
+               ifnull(t.file_path, p.file_path) as filePath, p.weight_count as weightCount,
               p.surcharge_count as surchargeCount, p.currency
        from pay_product_term t
        join pay_product p on p.product_id = t.product_id
@@ -34,9 +35,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

    <insert id="insertTerm" parameterType="com.bms.price.domain.PayProductTerm" useGeneratedKeys="true" keyProperty="termId">
        insert into pay_product_term (
-            dict_value, product_id, version_no, effective_start, effective_end, status, created_by, create_time, remark
+            dict_value, product_id, version_no, effective_start, effective_end, file_path, status, created_by, create_time, remark
        ) values (
-            #{dictValue}, #{productId}, ifnull(#{versionNo}, 1), #{effectiveStart}, #{effectiveEnd},
+            #{dictValue}, #{productId}, ifnull(#{versionNo}, 1), #{effectiveStart}, #{effectiveEnd}, #{filePath},
            ifnull(#{status}, '0'), #{createBy}, sysdate(), #{remark}
        )
    </insert>