From ac9eb0dd21f6915844c142e5cd29275276ce7f85 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 20 三月 2025 13:06:02 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat
---
iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StScheduleSchemeDao.xml | 7 ++++---
1 files changed, 4 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..3e4049e 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
@@ -8,12 +8,13 @@
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 '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 'suggest' type, t2.title, t2.content, t2.schedule_time `time`, t2.schedule_obj obj,t2.status
from t_st_schedule_suggest t2
) t
<where>
--
Gitblit v1.9.3