From b0765ec5be45d6db1993064d5261bf42e94d161f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 12 八月 2025 16:38:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into pim_yys
---
src/main/resources/mapper/device/DeviceLedgerMapper.xml | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceLedgerMapper.xml b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
index 588e518..4a8f435 100644
--- a/src/main/resources/mapper/device/DeviceLedgerMapper.xml
+++ b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
@@ -55,6 +55,13 @@
AND update_user LIKE CONCAT('%', #{deviceLedger.updateUser}, '%')
</if>
+ <if test="deviceLedger.entryDateStart != null and deviceLedger.entryDateStart != '' ">
+ AND dl.create_time >= DATE_FORMAT(#{deviceLedger.entryDateStart},'%Y-%m-%d')
+ </if>
+ <if test="deviceLedger.entryDateEnd != null and deviceLedger.entryDateEnd != '' ">
+ AND dl.create_time <= DATE_FORMAT(#{deviceLedger.entryDateEnd},'%Y-%m-%d')
+ </if>
+
<!-- 绉熸埛ID -->
<if test="deviceLedger.tenantId != null">
AND tenant_id = #{deviceLedger.tenantId}
--
Gitblit v1.9.3