From 5a7bbbce3841ea78dc8a08080e9d5f1d67d336d5 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 18 Feb 2025 15:40:55 +0800
Subject: [PATCH] md

---
 .../erp/emis/domain/EmisTmsCostFeeFeeitem.java    |  2 ++
 .../mapper/EmisTmsCostFeeFeeitemMapper.xml        | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFeeFeeitem.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFeeFeeitem.java
index 9ba824a68..381991b5e 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFeeFeeitem.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFeeFeeitem.java
@@ -39,6 +39,8 @@ public class EmisTmsCostFeeFeeitem extends BaseEntity
     private String costNo;
     /* 费用类型 */
     private String feeType;
+    /* 单价 */
+    private BigDecimal price;
     /* 费用值 */
     private BigDecimal fee;
     /* 费用币种 */
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeFeeitemMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeFeeitemMapper.xml
index bc55ab59d..5ed541770 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeFeeitemMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeFeeitemMapper.xml
@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="costNo"    column="cost_no"    />
         <result property="feeType"    column="fee_type"    />
+        <result property="price"    column="price"    />
         <result property="fee"    column="fee"    />
         <result property="currency"    column="currency"    />
         <result property="currecyToCnyRate"    column="currecy_to_cny_rate"    />
@@ -16,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEmisTmsCostFeeFeeitemVo">
-        select id, cost_no, fee_type, fee, currency, currecy_to_cny_rate, cny_fee, order_num, del_flag, create_by, create_time, update_by, update_time, remark from emis_tms_cost_fee_feeitem
+        select id, cost_no, fee_type, price, fee, currency, currecy_to_cny_rate, cny_fee, order_num, del_flag, create_by, create_time, update_by, update_time, remark from emis_tms_cost_fee_feeitem
     </sql>
 
     <select id="selectEmisTmsCostFeeFeeitemList" parameterType="EmisTmsCostFeeFeeitem" resultMap="EmisTmsCostFeeFeeitemResult">
@@ -26,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="id != null "> and id = #{id}</if>
             <if test="costNo != null  and costNo != ''"> and cost_no like concat('%', #{costNo}, '%')</if>
             <if test="feeType != null  and feeType != ''"> and fee_type like concat('%', #{feeType}, '%')</if>
+            <if test="price != null "> and price = #{price}</if>
             <if test="fee != null "> and fee = #{fee}</if>
             <if test="currency != null  and currency != ''"> and currency like concat('%', #{currency}, '%')</if>
             <if test="currecyToCnyRate != null "> and currecy_to_cny_rate = #{currecyToCnyRate}</if>
@@ -62,13 +64,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
   
     <select id="selectEmisTmsCostFeeFeeitemById" parameterType="Long" resultMap="EmisTmsCostFeeFeeitemResult">
-        select id, cost_no, fee_type, fee, currency, currecy_to_cny_rate, cny_fee, order_num, del_flag, create_by, create_time, update_by, update_time, remark 
+        select id, cost_no, fee_type, price, fee, currency, currecy_to_cny_rate, cny_fee, order_num, del_flag, create_by, create_time, update_by, update_time, remark
         from emis_tms_cost_fee_feeitem a
         where a.id = #{id}
     </select>
 
     <select id="selectEmisTmsCostFeeFeeitemByCostNo" parameterType="String" resultMap="EmisTmsCostFeeFeeitemResult">
-        select id, cost_no, fee_type, fee, currency, currecy_to_cny_rate, cny_fee, order_num, del_flag, create_by, create_time, update_by, update_time, remark
+        select id, cost_no, fee_type, price, fee, currency, currecy_to_cny_rate, cny_fee, order_num, del_flag, create_by, create_time, update_by, update_time, remark
         from emis_tms_cost_fee_feeitem a
         where del_flag='0' and a.cost_no = #{costNo}
     </select>
@@ -78,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="costNo != null and costNo != ''">cost_no,</if>
             <if test="feeType != null and feeType != ''">fee_type,</if>
+            <if test="price != null">price,</if>
             <if test="fee != null">fee,</if>
             <if test="currency != null and currency != ''">currency,</if>
             <if test="currecyToCnyRate != null">currecy_to_cny_rate,</if>
@@ -89,10 +92,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null and updateBy != ''">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null and remark != ''">remark,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="costNo != null and costNo != ''">#{costNo},</if>
             <if test="feeType != null and feeType != ''">#{feeType},</if>
+            <if test="price != null">#{price},</if>
             <if test="fee != null">#{fee},</if>
             <if test="currency != null and currency != ''">#{currency},</if>
             <if test="currecyToCnyRate != null">#{currecyToCnyRate},</if>
@@ -104,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateEmisTmsCostFeeFeeitem" parameterType="EmisTmsCostFeeFeeitem">
@@ -112,6 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="costNo != null and costNo != ''">cost_no = #{costNo},</if>
             <if test="feeType != null and feeType != ''">fee_type = #{feeType},</if>
+            <if test="price != null">price = #{price},</if>
             <if test="fee != null">fee = #{fee},</if>
             <if test="currency != null and currency != ''">currency = #{currency},</if>
             <if test="currecyToCnyRate != null">currecy_to_cny_rate = #{currecyToCnyRate},</if>