From e74472c0573fdd4cd4bcfc85e2988e0478d4ffb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Thu, 21 May 2026 14:17:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=A4=9A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../baseInformation/SrmCurrencyMapper.xml     | 22 ++---
 .../baseInformation/SrmDeliveryTermMapper.xml | 32 +++----
 .../baseInformation/SrmPaymentTermMapper.xml  | 88 +++++++++----------
 .../mapper/baseInformation/SrmTaxMapper.xml   | 64 +++++++-------
 4 files changed, 103 insertions(+), 103 deletions(-)

diff --git a/src/main/resources/mapper/baseInformation/SrmCurrencyMapper.xml b/src/main/resources/mapper/baseInformation/SrmCurrencyMapper.xml
index 33e8bd6..005e57e 100644
--- a/src/main/resources/mapper/baseInformation/SrmCurrencyMapper.xml
+++ b/src/main/resources/mapper/baseInformation/SrmCurrencyMapper.xml
@@ -5,9 +5,9 @@
     <resultMap id="CurrencyResultMap" type="com.xujie.modules.baseInformation.entity.SrmCurrency">
         <result property="currency" column="Currency"/>
         <result property="site" column="Site"/>
-        <result property="currencyDesc" column="CurrencyDesc"/>
+        <result property="currencyDesc" column="currency_desc"/>
         <result property="active" column="Active"/>
-        <result property="baseCurrency" column="BaseCurrency"/>
+        <result property="baseCurrency" column="base_currency"/>
     </resultMap>
 
     
@@ -16,9 +16,9 @@
         SELECT
         Currency,
         Site,
-        CurrencyDesc,
+        currency_desc,
         Active,
-        BaseCurrency
+        base_currency
         FROM Currency
         <where>
             <if test="currency.site != null and currency.site != ''">
@@ -28,7 +28,7 @@
                 AND Currency = #{currency.currency}
             </if>
             <if test="currency.currencyDesc != null and currency.currencyDesc != ''">
-                AND CurrencyDesc LIKE CONCAT('%', #{currency.currencyDesc}, '%')
+                AND currency_desc LIKE CONCAT('%', #{currency.currencyDesc}, '%')
             </if>
             <if test="currency.active != null and currency.active != ''">
                 AND Active = #{currency.active}
@@ -42,9 +42,9 @@
         SELECT
         Currency,
         Site,
-        CurrencyDesc,
+        currency_desc,
         Active,
-        BaseCurrency
+        base_currency
         FROM Currency
         WHERE Currency = #{currency} AND Site = #{site}
     </select>
@@ -61,9 +61,9 @@
         INSERT INTO Currency (
             Currency,
             Site,
-            CurrencyDesc,
+        currency_desc,
             Active,
-            BaseCurrency
+        base_currency
         ) VALUES (
             #{currency},
             #{site},
@@ -78,7 +78,7 @@
         UPDATE Currency
         <set>
             <if test="currencyDesc != null and currencyDesc != ''">
-                CurrencyDesc = #{currencyDesc},
+                currency_desc = #{currencyDesc},
             </if>
             <if test="site != null and site != ''">
                 Site = #{site},
@@ -87,7 +87,7 @@
                 Active = #{active},
             </if>
             <if test="baseCurrency != null">
-                BaseCurrency = #{baseCurrency},
+                base_currency = #{baseCurrency},
             </if>
         </set>
         WHERE Currency = #{currency} AND Site = #{site}
diff --git a/src/main/resources/mapper/baseInformation/SrmDeliveryTermMapper.xml b/src/main/resources/mapper/baseInformation/SrmDeliveryTermMapper.xml
index ae4565b..8e8d7dc 100644
--- a/src/main/resources/mapper/baseInformation/SrmDeliveryTermMapper.xml
+++ b/src/main/resources/mapper/baseInformation/SrmDeliveryTermMapper.xml
@@ -3,18 +3,18 @@
 <mapper namespace="com.xujie.modules.baseInformation.mapper.SrmDeliveryTermMapper">
 
     <resultMap id="DeliveryTermResultMap" type="com.xujie.modules.baseInformation.entity.SrmDeliveryTerm">
-        <result property="deliveryTermId" column="DeliveryTermID"/>
+        <result property="deliveryTermId" column="delivery_term_id"/>
         <result property="site" column="Site"/>
-        <result property="deliveryTerm" column="DeliveryTerm"/>
+        <result property="deliveryTerm" column="delivery_term"/>
         <result property="active" column="Active"/>
     </resultMap>
 
     <!-- 分页查询交货条件列表 -->
     <select id="selectDeliveryTermListWithPaging" resultMap="DeliveryTermResultMap">
         SELECT
-            DeliveryTermID,
+            delivery_term_id,
             Site,
-            DeliveryTerm,
+            delivery_term,
             Active
         FROM DeliveryTerm
         <where>
@@ -22,27 +22,27 @@
                 AND Site = #{deliveryTerm.site}
             </if>
             <if test="deliveryTerm.deliveryTermId != null and deliveryTerm.deliveryTermId != ''">
-                AND DeliveryTermID = #{deliveryTerm.deliveryTermId}
+                AND delivery_term_id = #{deliveryTerm.deliveryTermId}
             </if>
             <if test="deliveryTerm.deliveryTerm != null and deliveryTerm.deliveryTerm != ''">
-                AND DeliveryTerm LIKE CONCAT('%', #{deliveryTerm.deliveryTerm}, '%')
+                AND delivery_term LIKE CONCAT('%', #{deliveryTerm.deliveryTerm}, '%')
             </if>
             <if test="deliveryTerm.active != null and deliveryTerm.active != ''">
                 AND Active = #{deliveryTerm.active}
             </if>
         </where>
-        ORDER BY DeliveryTermID
+        ORDER BY delivery_term_id
     </select>
 
     <!-- 根据交货条件代码查询 -->
     <select id="selectDeliveryTermByCode" resultMap="DeliveryTermResultMap">
         SELECT
-            DeliveryTermID,
+            delivery_term_id,
             Site,
-            DeliveryTerm,
+            delivery_term,
             Active
         FROM DeliveryTerm
-        WHERE DeliveryTermID = #{deliveryTermId}
+        WHERE delivery_term_id = #{deliveryTermId}
     </select>
 
     <!-- 检查交货条件是否被引用 -->
@@ -55,16 +55,16 @@
     <select id="selectCount" resultType="java.lang.Integer">
         SELECT COUNT(1)
         FROM DeliveryTerm
-        WHERE  DeliveryTermID = #{deliveryTermId}
+        WHERE  delivery_term_id = #{deliveryTermId}
     </select>
 
 
     <!-- 新增交货条件 -->
     <insert id="insertDeliveryTerm">
         INSERT INTO DeliveryTerm (
-            DeliveryTermID,
+            delivery_term_id,
             Site,
-            DeliveryTerm,
+            delivery_term,
             Active
         ) VALUES (
             #{deliveryTermId},
@@ -79,19 +79,19 @@
         UPDATE DeliveryTerm
         <set>
             <if test="deliveryTerm != null and deliveryTerm != ''">
-                DeliveryTerm = #{deliveryTerm},
+                delivery_term = #{deliveryTerm},
             </if>
             <if test="active != null and active != ''">
                 Active = #{active}
             </if>
         </set>
-        WHERE DeliveryTermID = #{deliveryTermId} AND Site = #{site}
+        WHERE delivery_term_id = #{deliveryTermId} AND Site = #{site}
     </update>
 
     <!-- 删除交货条件 -->
     <delete id="deleteDeliveryTerm">
         DELETE FROM DeliveryTerm
-        WHERE DeliveryTermID = #{deliveryTermId} AND Site = #{site}
+        WHERE delivery_term_id = #{deliveryTermId} AND Site = #{site}
     </delete>
 
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/baseInformation/SrmPaymentTermMapper.xml b/src/main/resources/mapper/baseInformation/SrmPaymentTermMapper.xml
index c31668e..a0d342f 100644
--- a/src/main/resources/mapper/baseInformation/SrmPaymentTermMapper.xml
+++ b/src/main/resources/mapper/baseInformation/SrmPaymentTermMapper.xml
@@ -2,70 +2,70 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xujie.modules.baseInformation.mapper.SrmPaymentTermMapper">
     <resultMap id="PaymentTermResultMap" type="com.xujie.modules.baseInformation.entity.SrmPaymentTerm">
-        <result property="paymentTermId" column="PaymentTermID"/>
-        <result property="site" column="Site"/>
-        <result property="paymentTerm" column="PaymentTerm"/>
-        <result property="days" column="Days"/>
-        <result property="type" column="Type"/>
-        <result property="active" column="Active"/>
+        <result property="paymentTermId" column="payment_term_id"/>
+        <result property="site" column="site"/>
+        <result property="paymentTerm" column="payment_term"/>
+        <result property="days" column="days"/>
+        <result property="type" column="type"/>
+        <result property="active" column="active"/>
     </resultMap>
 
     <!-- 分页查询付款条款列表 -->
     <select id="selectPaymentTermListWithPaging" resultMap="PaymentTermResultMap">
         SELECT
-        PaymentTermID,
-        Site,
-        PaymentTerm,
-        Days,
-        Type,
-        Active
+            payment_term_id,
+            site,
+            payment_term,
+            days,
+            type,
+            active
         FROM PaymentTerm
         <where>
             <if test="paymentTerm.site != null and paymentTerm.site != ''">
-                AND Site = #{paymentTerm.site}
+                AND site = #{paymentTerm.site}
             </if>
             <if test="paymentTerm.paymentTermId != null and paymentTerm.paymentTermId != ''">
-                AND PaymentTermID = #{paymentTerm.paymentTermId}
+                AND payment_term_id = #{paymentTerm.paymentTermId}
             </if>
             <if test="paymentTerm.paymentTerm != null and paymentTerm.paymentTerm != ''">
-                AND PaymentTerm LIKE CONCAT('%', #{paymentTerm.paymentTerm}, '%')
+                AND payment_term LIKE CONCAT('%', #{paymentTerm.paymentTerm}, '%')
             </if>
             <if test="paymentTerm.active != null and paymentTerm.active != ''">
-                AND Active = #{paymentTerm.active}
+                AND active = #{paymentTerm.active}
             </if>
         </where>
-        ORDER BY PaymentTermID
+        ORDER BY payment_term_id
     </select>
 
     <!--根据付款条款代码查询-->
     <select id="selectPaymentTermByCode" resultMap="PaymentTermResultMap">
         SELECT
-        PaymentTermID,
-        Site,
-        PaymentTerm,
-        Days,
-        Type,
-        Active
+            payment_term_id,
+            site,
+            payment_term,
+            days,
+            type,
+            active
         FROM PaymentTerm
-        WHERE PaymentTermID = #{paymentTermId} AND Site = #{site}
+        WHERE payment_term_id = #{paymentTermId} AND site = #{site}
     </select>
 
     <!-- 新增付款条款 -->
     <insert id="insertPaymentTerm">
         INSERT INTO PaymentTerm (
-        PaymentTermID,
-        Site,
-        PaymentTerm,
-        Days,
-        Type,
-        Active
+            payment_term_id,
+            site,
+            payment_term,
+            days,
+            type,
+            active
         ) VALUES (
-        #{paymentTermId},
-        #{site},
-        #{paymentTerm},
-        #{days},
-        #{type},
-        #{active}
+            #{paymentTermId},
+            #{site},
+            #{paymentTerm},
+            #{days},
+            #{type},
+            #{active}
         )
     </insert>
 
@@ -74,23 +74,23 @@
         UPDATE PaymentTerm
         <set>
             <if test="paymentTerm != null and paymentTerm != ''">
-                PaymentTerm = #{paymentTerm},
+                payment_term = #{paymentTerm},
             </if>
             <if test="days != null and days != ''">
-                Days = #{days},
+                days = #{days},
             </if>
             <if test="type != null and type != ''">
-                Type = #{type},
+                type = #{type},
             </if>
             <if test="active != null and active != ''">
-                Active = #{active}
+                active = #{active}
             </if>
         </set>
-        WHERE PaymentTermID = #{paymentTermId} AND Site = #{site}
+        WHERE payment_term_id = #{paymentTermId} AND site = #{site}
     </update>
 
 <!--检查付款条款是否被引用-->
-    <select id="checkPaymentTermReference">
+    <select id="checkPaymentTermReference" resultType="Integer">
         SELECT COUNT(1)
         FROM srm_supplier
         WHERE PaymentTerm = #{paymentTermId} AND site = #{site}
@@ -99,6 +99,6 @@
     <!--删除付款条款-->
     <delete id="deletePaymentTerm">
         DELETE FROM PaymentTerm
-        WHERE PaymentTermID = #{paymentTermId} AND Site = #{site}
+        WHERE payment_term_id = #{paymentTermId} AND site = #{site}
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/mapper/baseInformation/SrmTaxMapper.xml b/src/main/resources/mapper/baseInformation/SrmTaxMapper.xml
index 0e6bcbe..e709226 100644
--- a/src/main/resources/mapper/baseInformation/SrmTaxMapper.xml
+++ b/src/main/resources/mapper/baseInformation/SrmTaxMapper.xml
@@ -2,56 +2,56 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xujie.modules.baseInformation.mapper.SrmTaxMapper">
     <resultMap id="TaxMap" type="com.xujie.modules.baseInformation.entity.SrmTax">
-        <result property="taxCode" column="Taxcode"/>
-        <result property="site" column="Site"/>
-        <result property="taxDesc" column="TaxDesc"/>
-        <result property="taxRate" column="TaxRate"/>
-        <result property="active" column="Active"/>
+        <result property="taxCode" column="tax_code"/>
+        <result property="site" column="site"/>
+        <result property="taxDesc" column="tax_desc"/>
+        <result property="taxRate" column="tax_rate"/>
+        <result property="active" column="active"/>
     </resultMap>
 
 
     <select id="selectTaxWithPaging" resultMap="TaxMap">
         SELECT
-        Taxcode,
-        Site,
-        TaxDesc,
-        TaxRate,
-        Active
+            tax_code,
+            site,
+            tax_desc,
+            tax_rate,
+            active
         FROM Tax
         <where>
             <if test="tax.site != null and tax.site != ''">
-                AND Site = #{tax.site}
+                AND site = #{tax.site}
             </if>
             <if test="tax.taxCode != null and tax.taxCode != ''">
-                AND Taxcode = #{tax.taxCode}
+                AND tax_code = #{tax.taxCode}
             </if>
             <if test="tax.taxDesc != null and tax.taxDesc != ''">
-                AND TaxDesc LIKE '%' + #{tax.taxDesc} + '%'
+                AND tax_desc LIKE '%' + #{tax.taxDesc} + '%'
             </if>
             <if test="tax.active != null and tax.active != ''">
-                AND Active = #{tax.active}
+                AND active = #{tax.active}
             </if>
         </where>
-        ORDER BY Taxcode
+        ORDER BY tax_code
     </select>
     <select id="selectTaxByCode" resultMap="TaxMap">
         SELECT
-            Taxcode,
-            Site,
-            TaxDesc,
-            TaxRate,
-            Active
+            tax_code,
+            site,
+            tax_desc,
+            tax_rate,
+            active
         FROM Tax
-        WHERE Taxcode = #{taxCode} AND Site = #{site}
+        WHERE tax_code = #{taxCode} AND site = #{site}
     </select>
 
     <insert id="insertTax">
         INSERT INTO Tax (
-            Taxcode,
-            Site,
-            TaxDesc,
-            TaxRate,
-            Active
+            tax_code,
+            site,
+            tax_desc,
+            tax_rate,
+            active
         ) VALUES (
                      #{taxCode},
                      #{site},
@@ -65,16 +65,16 @@
         UPDATE Tax
         <set>
             <if test="taxDesc != null and taxDesc != ''">
-                TaxDesc = #{taxDesc},
+                tax_desc = #{taxDesc},
             </if>
             <if test="taxRate != null and taxRate != ''">
-                TaxRate = #{taxRate},
+                tax_rate = #{taxRate},
             </if>
             <if test="active != null and active != ''">
-                Active = #{active}
+                active = #{active}
             </if>
         </set>
-        WHERE Taxcode = #{taxCode} AND Site = #{site}
+        WHERE tax_code = #{taxCode} AND site = #{site}
     </update>
     <select id="checkTaxReference">
         SELECT COUNT(1)
@@ -84,6 +84,6 @@
 
     <delete id="deleteTax">
         DELETE FROM Tax
-        WHERE Taxcode = #{taxCode} AND Site = #{site}
+        WHERE tax_code = #{taxCode} AND site = #{site}
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>