From 0e0a373af02e073f6bd079873743c58fcd4251f3 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 02 四月 2026 13:38:07 +0800
Subject: [PATCH] 1.TMS 增加一个推送状态字段，记录是否推送成功 2.TMS 增加一个手动推送按钮，如果推送失败或者被驳回的账单可以二次手动推送
---
tms/src/main/resources/mapper/tms/TmsApBillMapper.xml | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/tms/src/main/resources/mapper/tms/TmsApBillMapper.xml b/tms/src/main/resources/mapper/tms/TmsApBillMapper.xml
index 5eb6039..2280199 100644
--- a/tms/src/main/resources/mapper/tms/TmsApBillMapper.xml
+++ b/tms/src/main/resources/mapper/tms/TmsApBillMapper.xml
@@ -23,10 +23,12 @@
<result property="serviceProviderId" column="service_provider_id" />
<result property="serviceProviderName" column="service_provider_name" />
<result property="serviceProviderType" column="service_provider_type" />
+ <result property="pushStatus" column="push_status" />
+ <result property="pushTime" column="push_time" />
</resultMap>
<sql id="selectTmsApBillVo">
- select thisTab.id, thisTab.system_no, thisTab.bill_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.service_provider_id, thisTab.service_provider_name, thisTab.service_provider_type from tms_ap_bill AS thisTab
+ select thisTab.id, thisTab.system_no, thisTab.bill_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.service_provider_id, thisTab.service_provider_name, thisTab.service_provider_type, thisTab.push_status, thisTab.push_time from tms_ap_bill AS thisTab
</sql>
<sql id="selectTmsApBillVoCount">
select count(0) from tms_ap_bill as thisTab
@@ -46,6 +48,7 @@
<if test="serviceProviderId != null "> and thisTab.service_provider_id = #{serviceProviderId}</if>
<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>
</sql>
<!--鏌ヨ-->
@@ -90,6 +93,8 @@
<if test="serviceProviderId != null">service_provider_id,</if>
<if test="serviceProviderName != null and serviceProviderName != ''">service_provider_name,</if>
<if test="serviceProviderType != null and serviceProviderType != ''">service_provider_type,</if>
+ <if test="pushStatus != null">push_status,</if>
+ <if test="pushTime != null">push_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -110,6 +115,8 @@
<if test="serviceProviderId != null">#{serviceProviderId},</if>
<if test="serviceProviderName != null and serviceProviderName != ''">#{serviceProviderName},</if>
<if test="serviceProviderType != null and serviceProviderType != ''">#{serviceProviderType},</if>
+ <if test="pushStatus != null">#{pushStatus},</if>
+ <if test="pushTime != null">#{pushTime},</if>
</trim>
</insert>
@@ -117,11 +124,11 @@
<insert id="insertTmsApBillBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
insert into tms_ap_bill
<trim prefix="(" suffix=") values" suffixOverrides=",">
- system_no,bill_name,settle_amount,settle_rate,dispatch_count,settled_amount,invoice_status,status,create_by,create_time,update_by,update_time,deduction_amount,actual_settlement_amount,
+ system_no,bill_name,settle_amount,settle_rate,dispatch_count,settled_amount,invoice_status,status,create_by,create_time,update_by,update_time,deduction_amount,actual_settlement_amount,push_status,push_time,
</trim>
<foreach item="item" index="index" collection="list" separator=",">
<trim prefix="(" suffix=") " suffixOverrides=",">
- #{item.systemNo},#{item.billName},#{item.settleAmount},#{item.settleRate},#{item.dispatchCount},#{item.settledAmount},#{item.invoiceStatus},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.deductionAmount},#{item.actualSettlementAmount},
+ #{item.systemNo},#{item.billName},#{item.settleAmount},#{item.settleRate},#{item.dispatchCount},#{item.settledAmount},#{item.invoiceStatus},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.deductionAmount},#{item.actualSettlementAmount},#{item.pushStatus},#{item.pushTime},
</trim>
</foreach>
</insert>
@@ -147,6 +154,8 @@
<if test="serviceProviderId != null">service_provider_id = #{serviceProviderId},</if>
<if test="serviceProviderName != null and serviceProviderName != ''">service_provider_name = #{serviceProviderName},</if>
<if test="serviceProviderType != null and serviceProviderType != ''">service_provider_type = #{serviceProviderType},</if>
+ <if test="pushStatus != null">push_status = #{pushStatus},</if>
+ <if test="pushTime != null">push_time = #{pushTime},</if>
</trim>
where id = #{id}
@@ -173,6 +182,8 @@
<if test="item.serviceProviderId != null">service_provider_id = #{item.serviceProviderId},</if>
<if test="item.serviceProviderName != null and item.serviceProviderName != ''">service_provider_name = #{item.serviceProviderName},</if>
<if test="item.serviceProviderType != null and item.serviceProviderType != ''">service_provider_type = #{item.serviceProviderType},</if>
+ <if test="item.pushStatus != null">push_status = #{item.pushStatus},</if>
+ <if test="item.pushTime != null">push_time = #{item.pushTime},</if>
</trim>
where id = #{item.id}
--
Gitblit v1.8.0