From 31bb16817c3702b4515a05e010dffa8b490c83b6 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 30 三月 2026 11:25:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hysn' into hysn
---
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 72f32d5..b06878b 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -57,7 +57,7 @@
T1.tenant_id,
T1.contract_amount,
T1.execution_date,
- T1.is_pass,
+ T1.approval_status,
T1.sales_type,
T2.nick_name AS entry_person_name,
T1.payment_method
@@ -83,8 +83,8 @@
<if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
AND T1.entry_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
</if>
- <if test="salesLedgerDto.isPass != null">
- AND T1.is_pass =#{salesLedgerDto.isPass}
+ <if test="salesLedgerDto.approvalStatus != null">
+ AND T1.approval_status =#{salesLedgerDto.approvalStatus}
</if>
</where>
</select>
--
Gitblit v1.9.3