From 10f1e6fa351732baf301cbb6d5dc01ef0e032414 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 3 Aug 2023 16:26:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ningdatech/pmapi/sys/controller/EarlyWarningController.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/EarlyWarningController.java b/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/EarlyWarningController.java
index 84c9d30..9c36213 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/EarlyWarningController.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/EarlyWarningController.java
@@ -27,7 +27,7 @@ import java.util.List;
 @Validated
 @RestController
 @RequestMapping("/api/v1/sys/early-warning")
-@Api(value = "EarlyWarning", tags = "系统管理-预警规则")
+@Api(value = "EarlyWarning", tags = "预警管理")
 @RequiredArgsConstructor
 public class EarlyWarningController {
 

From 005bf0a700f78d6eb117898ef120850cedc41ef7 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 3 Aug 2023 16:44:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E8=AE=B0=E5=BD=95=20?=
 =?UTF-8?q?=E9=99=8D=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/sys/service/impl/EarlyWarningRecordsServiceImpl.java         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/sys/service/impl/EarlyWarningRecordsServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/sys/service/impl/EarlyWarningRecordsServiceImpl.java
index af2411e..99ab9a3 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/sys/service/impl/EarlyWarningRecordsServiceImpl.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/sys/service/impl/EarlyWarningRecordsServiceImpl.java
@@ -43,7 +43,8 @@ public class EarlyWarningRecordsServiceImpl extends ServiceImpl<EarlyWarningReco
                 .like(StringUtils.isNotBlank(req.getProjectName()), WflowEarlyWarningRecords::getProjectName, req.getProjectName())
                 .like(StringUtils.isNotBlank(req.getBuildOrgName()), WflowEarlyWarningRecords::getBuildOrgName, req.getBuildOrgName())
                 .ge(Objects.nonNull(req.getStartTime()),WflowEarlyWarningRecords::getWarningTime,req.getStartTime())
-                .le(Objects.nonNull(req.getEndTime()),WflowEarlyWarningRecords::getWarningTime,req.getEndTime());
+                .le(Objects.nonNull(req.getEndTime()),WflowEarlyWarningRecords::getWarningTime,req.getEndTime())
+                .orderByDesc(WflowEarlyWarningRecords::getCreateOn);
 
         this.page(page,wrapper);