getAlarmAndSuggestPage 排序

 iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/StAlarmAndSuggestRespVO.java

@@ -39,4 +39,7 @@

    @Schema(description = "状态（0未处理 1已采纳 2已忽略）")
    private Integer status;

    @Schema(description = "排序")
    private Integer sort;
}

 iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StScheduleSchemeDao.xml

@@ -10,12 +10,13 @@
        t.content,
        t.time,
        t.obj,
        t.status
        t.status,
        t.sort
        from (
                 select id,'alarm' type, t1.title, t1.content, t1.alarm_time `time`, t1.alarm_obj obj,0 status
                 select id,'alarm' type, t1.title, t1.content, t1.alarm_time `time`, t1.alarm_obj obj,0 status, 0 sort
                 from t_mm_predict_alarm_message t1
                 UNION
                 select id,'suggest' type, t2.title, t2.content, t2.schedule_time `time`, t2.schedule_obj obj,t2.status
                 select id,'suggest' type, t2.title, t2.content, t2.schedule_time `time`, t2.schedule_obj obj,t2.status,t2.sort
                 from t_st_schedule_suggest t2
        ) t
        <where>
@@ -52,7 +53,7 @@
            </if>

        </where>
        order by t.time desc
        order by t.time desc, t.sort ASC

    </select>
</mapper>