From a02c1e14132c4312b2331275df1d79caad23d54f Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 25 二月 2025 15:04:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StScheduleSchemeDao.xml |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StScheduleSchemeDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StScheduleSchemeDao.xml
index e9d9a3e..eea763b 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StScheduleSchemeDao.xml
+++ b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StScheduleSchemeDao.xml
@@ -18,13 +18,22 @@
         ) t
         <where>
             <if test="params.obj != null and params.obj != ''">
-                and t.obj = #{obj}
+                and t.obj = #{params.obj}
             </if>
-            <if test="params.startTime != null and params.startTime != ''">
-                and t.time &gt;= #{startTime}
+            <if test="params.type != null and params.type != ''">
+                and t.type = #{params.type}
             </if>
-            <if test="params.endTime != null and params.endTime != ''">
-                and t.time &lt;= #{endTime}
+            <if test="params.startTime != null">
+                and t.time &gt;= #{params.startTime}
+            </if>
+            <if test="params.endTime != null">
+                and t.time &lt;= #{params.endTime}
+            </if>
+            <if test="params.objList != null">
+                and t.obj in
+                <foreach collection="params.objList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
             </if>
         </where>
         order by t.time desc

--
Gitblit v1.9.3