From b03c3980b058d8390d295be3af046549346a9b52 Mon Sep 17 00:00:00 2001
From: maxiangong <298222784@qq.com>
Date: Wed, 24 Jun 2026 16:35:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A7=BD=E6=B6=B2=E7=AE=A1=E7=90=86=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/quality/controller/LiquidTankController.java            | 1 +
 .../desk/quality/controller/LiquidTankTaskController.java        | 1 +
 .../org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml | 1 +
 3 files changed, 3 insertions(+)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java
index 90c04e768..72de5280d 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java
@@ -115,6 +115,7 @@ public class LiquidTankController extends BladeController {
                                        Query query) {
         QueryUtils.convertSortField(query);
         QueryWrapper<LiquidTank> qw = Condition.getQueryWrapper(liquidTank, LiquidTank.class);
+        qw.orderByAsc("WORK_TANK_ID", "WORK_CENTER_ID");
         IPage<LiquidTank> pages = service.page(Condition.getPage(query), qw);
         IPage<LiquidTankVO> pagesVO = LiquidTankWrapper.build().pageVO(pages);
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java
index 7362b9192..304898c00 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java
@@ -145,6 +145,7 @@ public class LiquidTankTaskController extends BladeController {
                                                 Query query) {
         QueryWrapper<LiquidTankTask> qw = Condition.getQueryWrapper(liquidTankTask, LiquidTankTask.class);
         qw.eq(BaseCol.STATUS, LiquidTankTaskConst.S_NOT_READY);
+        qw.orderByAsc("TRUNC(CREATE_TIME)",  "WORK_TANK_ID", "WORK_CENTER_ID");
         IPage<LiquidTankTask> pages = service.page(Condition.getPage(query), qw);
         IPage<LiquidTankTaskVO> pagesVO = LiquidTankTaskWrapper.build().pageVO(pages);
         pagesVO.getRecords()
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml
index ec8157801..1958a0c08 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml
@@ -172,6 +172,7 @@ TS_NAME
         <if test = "task.createTimeEnd != null">
             AND task.CREATE_TIME &lt;= #{task.createTimeEnd}
         </if>
+        ORDER BY TRUNC(task.CREATE_TIME) ASC, task.WORK_TANK_ID ASC, task.WORK_CENTER_ID ASC
     </select>
 
     <select id="exportLiquidTankTask"