From 5627248e473253b3f10615d6be8b27bb7cc7c4f7 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期五, 10 四月 2026 14:49:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
tms/src/main/resources/mapper/tms/TmsArBillMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/tms/src/main/resources/mapper/tms/TmsArBillMapper.xml b/tms/src/main/resources/mapper/tms/TmsArBillMapper.xml
index 89e45fc..0268376 100644
--- a/tms/src/main/resources/mapper/tms/TmsArBillMapper.xml
+++ b/tms/src/main/resources/mapper/tms/TmsArBillMapper.xml
@@ -24,10 +24,11 @@
<result property="actualSettlementAmount" column="actual_settlement_amount" />
<result property="pushStatus" column="push_status" />
<result property="pushTime" column="push_time" />
+ <result property="sourceSystemId" column="source_system_id" />
</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, thisTab.deduction_amount, thisTab.actual_settlement_amount, thisTab.push_status, thisTab.push_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, thisTab.push_status, thisTab.push_time, thisTab.source_system_id from tms_ar_bill AS thisTab
</sql>
<sql id="selectTmsArBillVoCount">
select count(0) from tms_ar_bill as thisTab
@@ -47,6 +48,7 @@
<if test="deductionAmount != null "> and thisTab.deduction_amount = #{deductionAmount}</if>
<if test="actualSettlementAmount != null "> and thisTab.actual_settlement_amount = #{actualSettlementAmount}</if>
<if test="pushStatus != null "> and thisTab.push_status = #{pushStatus}</if>
+ <if test="sourceSystemId != null "> and thisTab.source_system_id = #{sourceSystemId}</if>
</sql>
<!--鏌ヨ-->
@@ -92,6 +94,7 @@
<if test="actualSettlementAmount != null">actual_settlement_amount,</if>
<if test="pushStatus != null">push_status,</if>
<if test="pushTime != null">push_time,</if>
+ <if test="sourceSystemId != null">source_system_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="systemNo != null and systemNo != ''">#{systemNo},</if>
@@ -112,17 +115,18 @@
<if test="actualSettlementAmount != null">#{actualSettlementAmount},</if>
<if test="pushStatus != null">#{pushStatus},</if>
<if test="pushTime != null">#{pushTime},</if>
+ <if test="sourceSystemId != null">#{sourceSystemId},</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,deduction_amount,actual_settlement_amount,push_status,push_time,
+ 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,push_status,push_time,source_system_id,
</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.deductionAmount},#{item.actualSettlementAmount},#{item.pushStatus},#{item.pushTime},
+ #{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},#{item.pushStatus},#{item.pushTime},#{item.sourceSystemId},
</trim>
</foreach>
</insert>
@@ -149,6 +153,7 @@
<if test="actualSettlementAmount != null">actual_settlement_amount = #{actualSettlementAmount},</if>
<if test="pushStatus != null">push_status = #{pushStatus},</if>
<if test="pushTime != null">push_time = #{pushTime},</if>
+ <if test="sourceSystemId != null">source_system_id = #{sourceSystemId},</if>
</trim>
where id = #{id}
</update>
@@ -175,6 +180,7 @@
<if test="item.actualSettlementAmount != null">actual_settlement_amount = #{item.actualSettlementAmount},</if>
<if test="item.pushStatus != null">push_status = #{item.pushStatus},</if>
<if test="item.pushTime != null">push_time = #{item.pushTime},</if>
+ <if test="item.sourceSystemId != null">source_system_id = #{item.sourceSystemId},</if>
</trim>
where id = #{item.id}
</foreach>
--
Gitblit v1.8.0