From 383993d98bcc43b8461febc640be3be59329252c Mon Sep 17 00:00:00 2001
From: yang_shj <1069818635@QQ.com>
Date: Thu, 7 Dec 2023 11:24:23 +0800
Subject: [PATCH] =?UTF-8?q?#=E6=97=A5=E5=B8=B8=E7=BB=B4=E6=8A=A4=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=A2=9E=E5=8A=A0=E8=AE=A1=E5=88=92Id=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java  | 1 +
 .../maintenance/service/impl/OperMaintenanceTaskServiceImpl.java       | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java
index b710add..e9dd76f 100644
--- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java
+++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java
@@ -62,6 +62,7 @@ public class AlarmServiceImpl extends BaseServiceImpl<AlarmMapper, AlarmEntity>
 
         // 参数过滤 ：站点、告警来源、告警子类
         QueryWrapper wrapper = new QueryWrapper<>();
+        wrapper.orderByDesc("CREATE_TIME");
         wrapper.eq("IS_RIGHT_TABULATION",0);
         wrapper.in("STATION_ID",stations.stream().map(StationEntity::getCode).collect(Collectors.toList()));
         if(!StringUtil.isEmpty(alarm.getStationId())){
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java
index 6d7b1fc..8881fc1 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java
@@ -153,6 +153,9 @@ public class OperMaintenanceTaskServiceImpl extends BaseServiceImpl<OperMaintena
             if (StringUtil.isNoneBlank(req.getFlowTaskName())) {
                 eq(OperMaintenanceTaskEntity::getFlowTaskName, req.getFlowTaskName());
             }
+            if(ObjectUtil.isNotEmpty(req.getPlanId())){
+                eq(OperMaintenanceTaskEntity::getPlanId,req.getPlanId());
+            }
         }};
         return queryWrapper;
     }