Merge branch '20230731_ls2_operation+early_warning+safety_risk+portrait' of http://git.ningdatech.com/liushuai/project-management into dev

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 {
 

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);