From 3e3cd7ad6d3787dac450deef5d5173de11abab94 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期一, 26 一月 2026 11:03:44 +0800
Subject: [PATCH] 修改为下单类型
---
tms/src/main/resources/mapper/tms/TmsArBillMapper.xml | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/tms/src/main/resources/mapper/tms/TmsArBillMapper.xml b/tms/src/main/resources/mapper/tms/TmsArBillMapper.xml
index 166130d..717240b 100644
--- a/tms/src/main/resources/mapper/tms/TmsArBillMapper.xml
+++ b/tms/src/main/resources/mapper/tms/TmsArBillMapper.xml
@@ -20,10 +20,12 @@
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
+ <result property="deductionAmount" column="deduction_amount" />
+ <result property="actualSettlementAmount" column="actual_settlement_amount" />
</resultMap>
<sql id="selectTmsArBillVo">
- select thisTab.id, thisTab.system_no, thisTab.bill_name, thisTab.customer_id, thisTab.customer_name, thisTab.settle_amount, thisTab.settle_rate, thisTab.dispatch_count, thisTab.settled_amount, thisTab.invoice_status, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time from tms_ar_bill AS thisTab
+ select thisTab.id, thisTab.system_no, thisTab.bill_name, thisTab.customer_id, thisTab.customer_name, thisTab.settle_amount, thisTab.settle_rate, thisTab.dispatch_count, thisTab.settled_amount, thisTab.invoice_status, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.deduction_amount, thisTab.actual_settlement_amount from tms_ar_bill AS thisTab
</sql>
<sql id="selectTmsArBillVoCount">
select count(0) from tms_ar_bill as thisTab
@@ -40,6 +42,8 @@
<if test="invoiceStatus != null "> and thisTab.invoice_status = #{invoiceStatus}</if>
<if test="customerId != null "> and thisTab.customer_id = #{customerId}</if>
<if test="status != null "> and thisTab.status = #{status}</if>
+ <if test="deductionAmount != null "> and thisTab.deduction_amount = #{deductionAmount}</if>
+ <if test="actualSettlementAmount != null "> and thisTab.actual_settlement_amount = #{actualSettlementAmount}</if>
</sql>
<!--鏌ヨ-->
@@ -81,6 +85,8 @@
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="customerId != null">customer_id,</if>
+ <if test="deductionAmount != null">deduction_amount,</if>
+ <if test="actualSettlementAmount != null">actual_settlement_amount,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="systemNo != null and systemNo != ''">#{systemNo},</if>
@@ -97,17 +103,19 @@
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="customerId != null">#{customerId},</if>
+ <if test="deductionAmount != null">#{deductionAmount},</if>
+ <if test="actualSettlementAmount != null">#{actualSettlementAmount},</if>
</trim>
</insert>
<insert id="insertTmsArBillBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
insert into tms_ar_bill
<trim prefix="(" suffix=") values" suffixOverrides=",">
- id,system_no,bill_name,customer_name,settle_amount,settle_rate,dispatch_count,settled_amount,invoice_status,status,create_by,create_time,update_by,update_time,customer_id,
+ id,system_no,bill_name,customer_name,settle_amount,settle_rate,dispatch_count,settled_amount,invoice_status,status,create_by,create_time,update_by,update_time,customer_id,deduction_amount,actual_settlement_amount,
</trim>
<foreach item="item" index="index" collection="list" separator=",">
<trim prefix="(" suffix=") " suffixOverrides=",">
- #{item.id},#{item.systemNo},#{item.billName},#{item.customerName},#{item.settleAmount},#{item.settleRate},#{item.dispatchCount},#{item.settledAmount},#{item.invoiceStatus},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.customerId},
+ #{item.id},#{item.systemNo},#{item.billName},#{item.customerName},#{item.settleAmount},#{item.settleRate},#{item.dispatchCount},#{item.settledAmount},#{item.invoiceStatus},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.customerId},#{item.deductionAmount},#{item.actualSettlementAmount},
</trim>
</foreach>
</insert>
@@ -130,6 +138,8 @@
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="customerId != null">customer_id = #{customerId},</if>
+ <if test="deductionAmount != null">deduction_amount = #{deductionAmount},</if>
+ <if test="actualSettlementAmount != null">actual_settlement_amount = #{actualSettlementAmount},</if>
</trim>
where id = #{id}
</update>
@@ -152,6 +162,8 @@
<if test="item.updateBy != null">update_by = #{item.updateBy},</if>
<if test="item.updateTime != null">update_time = #{item.updateTime},</if>
<if test="item.customerId != null">customer_id = #{item.customerId},</if>
+ <if test="item.deductionAmount != null">deduction_amount = #{item.deductionAmount},</if>
+ <if test="item.actualSettlementAmount != null">actual_settlement_amount = #{item.actualSettlementAmount},</if>
</trim>
where id = #{item.id}
</foreach>
--
Gitblit v1.8.0