From 4624b6fd58f262ab95f2d60472560b9fc162d677 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 01 四月 2025 14:56:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StScheduleSchemeDao.xml |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 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..45155f6 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
@@ -4,27 +4,38 @@
 
     <select id="getAlarmAndSuggestPage" resultType="com.iailab.module.model.api.mcs.dto.StAlarmAndSuggestRespVO">
         select
+        t.id,
         t.type,
         t.title,
         t.content,
         t.time,
-        t.obj
+        t.obj,
+        t.status
         from (
-                 select 'alarm' type, t1.title, t1.content, t1.alarm_time `time`, t1.alarm_obj obj
+                 select id,'alarm' type, t1.title, t1.content, t1.alarm_time `time`, t1.alarm_obj obj,0 status
                  from t_mm_predict_alarm_message t1
                  UNION
-                 select 'suggest' type, t2.title, t2.content, t2.schedule_time `time`, t2.schedule_obj obj
+                 select id,'suggest' type, t2.title, t2.content, t2.schedule_time `time`, t2.schedule_obj obj,t2.status
                  from t_st_schedule_suggest t2
         ) 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