From f02142ed034f1c7c09ea0b4a3bbd1e99c900e1f9 Mon Sep 17 00:00:00 2001
From: aikai <ZZL86tdd>
Date: Tue, 1 Jul 2025 09:35:42 +0800
Subject: [PATCH] =?UTF-8?q?refactor(bpm):=20=E4=BC=98=E5=8C=96=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E8=AE=A2=E5=8D=95=E7=9B=B8=E5=85=B3=20SQL=20=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=B8=AD=E7=9A=84=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将单一的 BETWEEN 条件拆分为两个独立的条件
- 允许单独搜索开始时间和结束时间
- 提高了查询的灵活性和准确性
---
 .../mapper/oa/BpmOAWorkOrderMapper.xml        | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOAWorkOrderMapper.xml b/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOAWorkOrderMapper.xml
index debb1856..93e0a311 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOAWorkOrderMapper.xml
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOAWorkOrderMapper.xml
@@ -81,8 +81,13 @@
             <if test="req.level != null">
                 AND w.level = #{req.level}
             </if>
-            <if test="req.createTime != null and req.createTime.length() > 0">
-                AND w.create_time BETWEEN #{req.createTime[0]} AND #{req.createTime[1]}
+            <if test="req.createTime != null and req.createTime.length > 0">
+                <if test="req.createTime[0] != null">
+                    AND w.create_time &gt;= #{req.createTime[0]}
+                </if>
+                <if test="req.createTime[1] != null">
+                    AND w.create_time &lt;= #{req.createTime[1]}
+                </if>
             </if>
         </where>
         ORDER BY w.id DESC
@@ -128,8 +133,13 @@
             <if test="req.status != null">
                 AND w.status = #{req.status}
             </if>
-            <if test="req.createTime != null and req.createTime.size() == 2">
-                AND w.create_time BETWEEN #{req.createTime[0]} AND #{req.createTime[1]}
+            <if test="req.createTime != null and req.createTime.length > 0">
+                <if test="req.createTime[0] != null">
+                    AND w.create_time &gt;= #{req.createTime[0]}
+                </if>
+                <if test="req.createTime[1] != null">
+                    AND w.create_time &lt;= #{req.createTime[1]}
+                </if>
             </if>
         </where>
         ORDER BY w.id DESC
@@ -175,8 +185,13 @@
             <if test="req.status != null">
                 AND w.status = #{req.status}
             </if>
-            <if test="req.createTime != null and req.createTime.size() == 2">
-                AND w.create_time BETWEEN #{req.createTime[0]} AND #{req.createTime[1]}
+            <if test="req.createTime != null and req.createTime.length > 0">
+                <if test="req.createTime[0] != null">
+                    AND w.create_time &gt;= #{req.createTime[0]}
+                </if>
+                <if test="req.createTime[1] != null">
+                    AND w.create_time &lt;= #{req.createTime[1]}
+                </if>
             </if>
         </where>
         ORDER BY w.id DESC