From 8d258026876dd93bd0407d5440d48294f41120ba Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 18 八月 2025 10:16:18 +0800
Subject: [PATCH] 新增字段
---
service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java | 1 +
service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml | 32 ++++++++++++++++++++++++--------
2 files changed, 25 insertions(+), 8 deletions(-)
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 2fbdb1e..d422d8b 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
@@ -160,6 +160,7 @@
estimatedReceivableBillLog.setOperation("淇敼璐﹀崟鍚嶇О涓�"+estimatedReceivableBill.getBillName());
logService.insertEstimatedReceivableBillLog(estimatedReceivableBillLog);
pendingSettlementBusinessMapper.updatePendingSettlementBusinessByBillId(estimatedReceivableBill.getId(),estimatedReceivableBill.getBillName());
+
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 ac244be..7510e95 100644
--- a/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml
@@ -549,14 +549,23 @@
</foreach>
</update>
<update id="updatePendingSettlementBusinessByBillId">
- UPDATE pending_settlement_business set bill_name = #{billName}
- where bill_id = #{id}
-
+ UPDATE pending_settlement_business p
+ JOIN estimated_receivable e ON p.dispatch_no = e.dispatch_no
+ SET
+ p.bill_name = #{billName},
+ e.related_bill_name = #{billName}
+ WHERE p.bill_id = #{id};
</update>
<update id="updateEstimatedReceivableBillStatus">
- UPDATE pending_settlement_business
- SET related_bill_status = #{status}
- WHERE dispatch_no IN
+ UPDATE pending_settlement_business p
+ JOIN estimated_receivable e ON p.dispatch_no = e.dispatch_no
+ SET
+ p.is_create = 1,
+ p.bill_id = #{id},
+ p.bill_name = #{billName},
+ p.related_bill_status = 1,
+ e.related_bill_name = #{billName}
+ WHERE p.dispatch_no IN
<foreach item="item" collection="list" open="(" separator="," close=")">
#{item}
</foreach>
@@ -573,8 +582,15 @@
</foreach>
</delete>
<delete id="cancelRelevancy">
- UPDATE pending_settlement_business set bill_id = null ,bill_name = null,is_create = 0,related_bill_status = 0
- where id = #{id}
+ UPDATE pending_settlement_business p
+LEFT JOIN estimated_receivable e ON p.dispatch_no = e.dispatch_no
+SET
+ p.bill_id = NULL,
+ p.bill_name = NULL,
+ p.is_create = 0,
+ p.related_bill_status = 0,
+ e.related_bill_name = NULL
+ WHERE p.id = #{id}
</delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0