From 4fa2589807e4ab70680acaf5fe072e3944fddcf6 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 24 四月 2025 17:17:01 +0800
Subject: [PATCH] GIL
---
iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StScheduleSchemeDao.xml | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 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 eea763b..b00534b 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,16 +4,18 @@
<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>
@@ -35,6 +37,20 @@
#{item}
</foreach>
</if>
+ <if test="params.title != null and params.title.size() > 0">
+ and t.title in
+ <foreach collection="params.title" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="params.contentKey != null and params.contentKey.size() > 0">
+ AND (
+ <foreach collection="params.contentKey" item="item" open="" separator="OR" close="">
+ t.content like concat('%',#{item},'%')
+ </foreach>
+ )
+ </if>
+
</where>
order by t.time desc
--
Gitblit v1.9.3