From a3a58429a92b8f729bc1f88391d27042255b377f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 14 十月 2026 12:20:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_海西州_惠牧' into dev_海西州_惠牧
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/maintenrecord/MesDvMaintenRecordMapper.java | 1 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/checkplan/MesDvCheckPlanMapper.java | 1 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/checkrecord/MesDvCheckRecordMapper.java | 1 +
3 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/checkplan/MesDvCheckPlanMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/checkplan/MesDvCheckPlanMapper.java
index d4b1aa4..6b07a1d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/checkplan/MesDvCheckPlanMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/checkplan/MesDvCheckPlanMapper.java
@@ -22,6 +22,7 @@
.eqIfPresent(MesDvCheckPlanDO::getType, reqVO.getType())
.eqIfPresent(MesDvCheckPlanDO::getStatus, reqVO.getStatus())
.betweenIfPresent(MesDvCheckPlanDO::getCreateTime, reqVO.getCreateTime())
+ .orderByDesc(MesDvCheckPlanDO::getCreateTime)
.orderByDesc(MesDvCheckPlanDO::getId));
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/checkrecord/MesDvCheckRecordMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/checkrecord/MesDvCheckRecordMapper.java
index d178f8e..eb1638e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/checkrecord/MesDvCheckRecordMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/checkrecord/MesDvCheckRecordMapper.java
@@ -22,6 +22,7 @@
.eqIfPresent(MesDvCheckRecordDO::getUserId, reqVO.getUserId())
.eqIfPresent(MesDvCheckRecordDO::getStatus, reqVO.getStatus())
.betweenIfPresent(MesDvCheckRecordDO::getCheckTime, reqVO.getCheckTime())
+ .orderByDesc(MesDvCheckRecordDO::getCreateTime)
.orderByDesc(MesDvCheckRecordDO::getId));
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/maintenrecord/MesDvMaintenRecordMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/maintenrecord/MesDvMaintenRecordMapper.java
index d8eafe6..f375a9a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/maintenrecord/MesDvMaintenRecordMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/maintenrecord/MesDvMaintenRecordMapper.java
@@ -21,6 +21,7 @@
.eqIfPresent(MesDvMaintenRecordDO::getMachineryId, reqVO.getMachineryId())
.eqIfPresent(MesDvMaintenRecordDO::getUserId, reqVO.getUserId())
.betweenIfPresent(MesDvMaintenRecordDO::getMaintenTime, reqVO.getMaintenTime())
+ .orderByDesc(MesDvMaintenRecordDO::getCreateTime)
.orderByDesc(MesDvMaintenRecordDO::getId));
}
--
Gitblit v1.9.3