From 8c1286c228d34232eef5bba3edef3efe0bbde9e9 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Fri, 6 Feb 2026 15:41:56 +0800
Subject: [PATCH] =?UTF-8?q?feat(dms):=20=E6=9B=B4=E6=96=B0=E5=85=B3?=
 =?UTF-8?q?=E6=9C=BA=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=8C=83=E5=9B=B4=E8=BF=87=E6=BB=A4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加 params 参数支持时间范围查询功能
- 实现 shut_begin_time 字段的时间区间过滤
- 保留原有的 shutBeginTime 和 shutEndTime 单点时间过滤
- 修复 XML 特殊字符转义问题
- 优化查询条件的组合逻辑
---
 .../main/resources/mapper/dms/DmsRecordShutDownMapper.xml  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml
index 5aa007b..ce2af2c 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml
@@ -43,8 +43,11 @@
         <where>
             <if test="shutType != null ">and shut_type_id = #{shutType}</if>
             <if test="shutReason != null  and shutReason != ''">and shut_reason = #{shutReason}</if>
-            <if test="shutBeginTime != null ">and shut_begin_time >= #{shutBeginTime}</if>
-            <if test="shutEndTime != null ">and #{shutEndTime}>=shut_end_time</if>
+            <if test="params != null and params.beginTime != null and params.endTime != null">
+                and shut_begin_time between #{params.beginTime} and #{params.endTime}
+            </if>
+            <if test="shutBeginTime != null ">and shut_begin_time &gt;= #{shutBeginTime}</if>
+            <if test="shutEndTime != null ">and #{shutEndTime} &gt;= shut_end_time</if>
             <if test="shutTime != null ">and shut_time = #{shutTime}</if>
             <if test="deviceCode != null and deviceCode != ''">and machine_id in (select OBJ_ID from base_deviceledger where device_code = #{deviceCode})</if>
         </where>