From ca412ade3b178fbc8ba0a4b6215a040acdede954 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 09 十二月 2025 10:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
tms/src/main/resources/mapper/tms/TmsFinanceDetailMapper.xml | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/tms/src/main/resources/mapper/tms/TmsFinanceDetailMapper.xml b/tms/src/main/resources/mapper/tms/TmsFinanceDetailMapper.xml
index d70b197..d3dd4bf 100644
--- a/tms/src/main/resources/mapper/tms/TmsFinanceDetailMapper.xml
+++ b/tms/src/main/resources/mapper/tms/TmsFinanceDetailMapper.xml
@@ -20,10 +20,15 @@
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
+ <result property="status" column="status" />
+ <result property="price" column="price" />
+ <result property="unit" column="unit" />
+ <result property="currency" column="currency" />
+ <result property="count" column="count" />
</resultMap>
<sql id="selectTmsFinanceDetailVo">
- select thisTab.id, thisTab.fee_type, thisTab.finance_id, thisTab.finance_type, thisTab.dispatch_order_id, thisTab.data_source, thisTab.create_id, thisTab.initial_fee_amount, thisTab.actual_fee_amount, thisTab.fee_voucher_url, thisTab.fee_create_time, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time from tms_finance_detail AS thisTab
+ select thisTab.id, thisTab.fee_type, thisTab.finance_id, thisTab.finance_type, thisTab.dispatch_order_id, thisTab.data_source, thisTab.create_id, thisTab.initial_fee_amount, thisTab.actual_fee_amount, thisTab.fee_voucher_url, thisTab.fee_create_time, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time , thisTab.status, thisTab.price, thisTab.unit, thisTab.currency, thisTab.count from tms_finance_detail AS thisTab
</sql>
<sql id="selectTmsFinanceDetailVoCount">
select count(0) from tms_finance_detail as thisTab
@@ -40,6 +45,11 @@
<if test="actualFeeAmount != null "> and thisTab.actual_fee_amount = #{actualFeeAmount}</if>
<if test="feeVoucherUrl != null and feeVoucherUrl != ''"> and thisTab.fee_voucher_url = #{feeVoucherUrl}</if>
<if test="feeCreateTime != null "> and thisTab.fee_create_time = #{feeCreateTime}</if>
+ <if test="status != null "> and thisTab.status = #{status}</if>
+ <if test="price != null "> and thisTab.price = #{price}</if>
+ <if test="unit != null "> and thisTab.unit = #{unit}</if>
+ <if test="currency != null "> and thisTab.currency = #{currency}</if>
+ <if test="count != null "> and thisTab.count = #{count}</if>
</sql>
<!--鏌ヨ-->
@@ -81,6 +91,11 @@
<if test="createTime != null">create_time,</if>
<if test="updateBy != null and updateBy != ''">update_by,</if>
<if test="updateTime != null">update_time,</if>
+ <if test="status != null">status,</if>
+ <if test="price != null">price,</if>
+ <if test="unit != null">unit,</if>
+ <if test="currency != null">currency,</if>
+ <if test="count != null">count,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="feeType != null">#{feeType},</if>
@@ -97,17 +112,22 @@
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
+ <if test="status != null">#{status},</if>
+ <if test="price != null">#{price},</if>
+ <if test="unit != null">#{unit},</if>
+ <if test="currency != null">#{currency},</if>
+ <if test="count != null">#{count},</if>
</trim>
</insert>
<insert id="insertTmsFinanceDetailBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
insert into tms_finance_detail
<trim prefix="(" suffix=") values" suffixOverrides=",">
- id,fee_type,finance_id,finance_type,dispatch_order_id,data_source,create_id,initial_fee_amount,actual_fee_amount,fee_voucher_url,fee_create_time,create_by,create_time,update_by,update_time,
+ fee_type,finance_id,finance_type,dispatch_order_id,data_source,create_id,initial_fee_amount,actual_fee_amount,fee_voucher_url,fee_create_time,create_by,create_time,status,price,unit,currency,count
</trim>
<foreach item="item" index="index" collection="list" separator=",">
<trim prefix="(" suffix=") " suffixOverrides=",">
- #{item.id},#{item.feeType},#{item.financeId},#{item.financeType},#{item.dispatchOrderId},#{item.dataSource},#{item.createId},#{item.initialFeeAmount},#{item.actualFeeAmount},#{item.feeVoucherUrl},#{item.feeCreateTime},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},
+ #{item.feeType},#{item.financeId},#{item.financeType},#{item.dispatchOrderId},#{item.dataSource},#{item.createId},#{item.initialFeeAmount},#{item.actualFeeAmount},#{item.feeVoucherUrl},#{item.feeCreateTime},#{item.createBy},#{item.createTime},#{item.status},#{item.price},#{item.unit},#{item.currency},#{item.count}
</trim>
</foreach>
</insert>
@@ -130,6 +150,11 @@
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="status != null">status = #{status},</if>
+ <if test="price != null">price = #{price},</if>
+ <if test="unit != null">unit = #{unit},</if>
+ <if test="currency != null">currency = #{currency},</if>
+ <if test="count != null">count = #{count},</if>
</trim>
where id = #{id}
</update>
@@ -152,6 +177,11 @@
<if test="item.createTime != null">create_time = #{item.createTime},</if>
<if test="item.updateBy != null and item.updateBy != ''">update_by = #{item.updateBy},</if>
<if test="item.updateTime != null">update_time = #{item.updateTime},</if>
+ <if test="item.status != null">status = #{item.status},</if>
+ <if test="item.count != null">count = #{item.count},</if>
+ <if test="item.currency != null">currency = #{item.currency},</if>
+ <if test="item.unit != null">unit = #{item.unit},</if>
+ <if test="item.price != null">price = #{item.price},</if>
</trim>
where id = #{item.id}
</foreach>
--
Gitblit v1.8.0