From 79335702441b5509449798362e784e39ab2639c3 Mon Sep 17 00:00:00 2001
From: Penknife <Penknife@>
Date: Sat, 18 Jan 2025 13:10:11 +0800
Subject: [PATCH] =?UTF-8?q?fix():=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fizz/business/service/impl/CrmPdoExcoilServiceImpl.java    | 2 +-
 .../com/fizz/business/service/impl/ProStoppageServiceImpl.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java
index fdd808a..79b73d9 100644
--- a/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java
+++ b/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java
@@ -78,7 +78,7 @@ public class CrmPdoExcoilServiceImpl extends ServiceImpl<CrmPdoExcoilMapper, Crm
 
         queryWrapper.ge("start_date", form.getStartDate() + " 00:00:00");
         queryWrapper.le("start_date", form.getEndDate() + " 23:59:59");
-
+        queryWrapper.orderByDesc("end_data");
         return baseMapper.selectList(queryWrapper);
     }
 }
diff --git a/business/src/main/java/com/fizz/business/service/impl/ProStoppageServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/ProStoppageServiceImpl.java
index c72ff42..814ca69 100644
--- a/business/src/main/java/com/fizz/business/service/impl/ProStoppageServiceImpl.java
+++ b/business/src/main/java/com/fizz/business/service/impl/ProStoppageServiceImpl.java
@@ -23,7 +23,8 @@ public class ProStoppageServiceImpl extends ServiceImpl<ProStoppageMapper, ProSt
 
         queryWrapper.ge("end_date", form.getStartDate() + " 00:00:00")
                 .le("end_date", form.getEndDate() + " 23:59:59")
-                .ge("duration", 300);
+                .ge("duration", 300)
+                .orderByDesc("end_date");
 
         List<ProStoppage> list = baseMapper.selectList(queryWrapper);
         list.forEach(item->item.setDuration(item.getDuration().divide(BigDecimal.valueOf(60),2)));