From b5943e51f38cd2e841f8e12e9da7d3495d96e310 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 18 八月 2025 10:01:39 +0800
Subject: [PATCH] 新增字段
---
service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java | 6 ++++++
service/src/main/java/com/ruoyi/cwgl/mapper/PendingSettlementBusinessMapper.java | 2 ++
service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java | 6 +++++-
service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml | 12 ++++++++++--
4 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java b/service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java
index 3b50813..f43da9d 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/PendingSettlementBusiness.java
@@ -391,10 +391,16 @@
*/
@TableField("bill_id")
private Integer billId;
+ /** 鍏宠仈璐﹀崟鐘舵�� */
+ @Excel(name = "鍏宠仈璐﹀崟鐘舵��")
+ @TableField("related_bill_status")
+ private Integer relatedBillStatus;
+
/**
* 鍏宠仈璐﹀崟id
*/
+ @Excel(name = "璐﹀崟鍚嶇О")
@TableField("bill_name")
private String billName;
diff --git a/service/src/main/java/com/ruoyi/cwgl/mapper/PendingSettlementBusinessMapper.java b/service/src/main/java/com/ruoyi/cwgl/mapper/PendingSettlementBusinessMapper.java
index 0d5f51e..c55dba1 100644
--- a/service/src/main/java/com/ruoyi/cwgl/mapper/PendingSettlementBusinessMapper.java
+++ b/service/src/main/java/com/ruoyi/cwgl/mapper/PendingSettlementBusinessMapper.java
@@ -110,4 +110,6 @@
void updatePendingSettlementBusinessByBillId(@Param("id") Integer id, @Param("billName")String billName);
PendingSettlementBusiness selectPendingSettlementBusinessByNo(String dispatchNo);
+
+ void updateEstimatedReceivableBillStatus(@Param("list") List<String> list, @Param("status") int status);
}
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java
index 45c4a2b..2fbdb1e 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java
@@ -230,7 +230,7 @@
estimatedReceivableBillLog.setOperation("鏈鎻愪氦閲戦"+ settlementAmount);
estimatedReceivableBillLog.setFileName(estimatedReceivableBill.getAttachment());
logService.insertEstimatedReceivableBillLog(estimatedReceivableBillLog);
- settledAmount = settledAmount.add(settlementAmount);
+
List<String>dispatchNos =pendingSettlementBusinessMapper.selectPendingSettlementBusinessDispatchNos(estimatedReceivableBill.getId());
// 妫�鏌ュ綋鍓嶆彁浜ら噾棰�+宸茬粨绠楅噾棰濇槸鍚﹁秴杩囧簲缁撶畻閲戦
if (settlementAmount.add(settledAmount).compareTo(totalAmount) > 0) {
@@ -241,11 +241,15 @@
//宸茬粨绠楀ぇ浜庡簲璁＄畻閲戦涓哄凡缁撶畻
estimatedReceivableBill.setStatus(2);
estimatedReceivableMapper.updateEstimatedReceivableBillStatus(dispatchNos,3);
+ pendingSettlementBusinessMapper.updateEstimatedReceivableBillStatus(dispatchNos,3);
}else {
//鍚﹀垯閮ㄥ垎缁撶畻
estimatedReceivableBill.setStatus(1);
estimatedReceivableMapper.updateEstimatedReceivableBillStatus(dispatchNos,2);
+ pendingSettlementBusinessMapper.updateEstimatedReceivableBillStatus(dispatchNos,2);
}
+ settledAmount = settledAmount.add(settlementAmount);
+ estimatedReceivableBill.setSettledAmount(settledAmount);
return estimatedReceivableBillMapper.updateEstimatedReceivableBill(estimatedReceivableBill);
}
diff --git a/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml b/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml
index d9e1d2e..c7d0c07 100644
--- a/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml
@@ -541,7 +541,7 @@
<update id="updatePendingSettlementBusinessIsCreate">
UPDATE pending_settlement_business
- SET is_create = 1 ,bill_id = #{id},bill_name = #{billName}
+ SET is_create = 1 ,bill_id = #{id},bill_name = #{billName},related_bill_status = 1
WHERE dispatch_no IN
<foreach item="item" collection="list" open="(" separator="," close=")">
#{item}
@@ -551,6 +551,14 @@
UPDATE pending_settlement_business set bill_name = #{billName}
where bill_id = #{id}
+ </update>
+ <update id="updateEstimatedReceivableBillStatus">
+ UPDATE pending_settlement_business
+ SET related_bill_status = #{status}
+ WHERE dispatch_no IN
+ <foreach item="item" collection="list" open="(" separator="," close=")">
+ #{item}
+ </foreach>
</update>
<!--鍒犻櫎-->
@@ -564,7 +572,7 @@
</foreach>
</delete>
<delete id="cancelRelevancy">
- UPDATE pending_settlement_business set bill_id = null ,bill_name = null,is_create = 0
+ UPDATE pending_settlement_business set bill_id = null ,bill_name = null,is_create = 0,related_bill_status = 0
where id = #{id}
</delete>
--
Gitblit v1.8.0