From 0b03e8ab1e3188c4dd8cbf4b38e220f9118ea2f1 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 25 九月 2025 10:34:41 +0800
Subject: [PATCH] yys 修改巡检bug
---
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 139b1fb..7ce76a8 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -29,7 +29,7 @@
T1.tenant_id,
T1.contract_amount,
T1.execution_date,
- T2.nick_name AS entry_person_name
+ T2.nick_name AS entry_person_name,
T1.payment_method
FROM
sales_ledger T1
@@ -64,16 +64,22 @@
LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
<where>
<if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
- T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
+ AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
</if>
<if test="salesLedgerDto.customerContractNo != null and salesLedgerDto.customerContractNo !='' ">
- T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
+ AND T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
</if>
<if test="salesLedgerDto.salesContractNo != null and salesLedgerDto.salesContractNo != '' ">
- T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.salesContractNo},'%')
+ AND T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.salesContractNo},'%')
</if>
<if test="salesLedgerDto.projectName != null and salesLedgerDto.projectName != '' ">
- T1.project_name LIKE CONCAT('%',#{salesLedgerDto.projectName},'%')
+ AND T1.project_name LIKE CONCAT('%',#{salesLedgerDto.projectName},'%')
+ </if>
+ <if test="salesLedgerDto.entryDateStart != null and salesLedgerDto.entryDateStart != '' ">
+ AND T1.entry_date >= DATE_FORMAT(#{salesLedgerDto.entryDateStart},'%Y-%m-%d')
+ </if>
+ <if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
+ AND T1.entry_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
</if>
</where>
</select>
--
Gitblit v1.9.3