From 844ffa2181d698f3871a62553fe10dd4054b63fa Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 29 八月 2023 10:23:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/MeteringPlanMapper.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/MeteringPlanMapper.xml b/inspect-server/src/main/resources/mapper/MeteringPlanMapper.xml
index 758a528..5e9f9db 100644
--- a/inspect-server/src/main/resources/mapper/MeteringPlanMapper.xml
+++ b/inspect-server/src/main/resources/mapper/MeteringPlanMapper.xml
@@ -30,10 +30,12 @@
<if test="meteringUnit != null and meteringUnit != ''">
AND m.`plan_unit` LIKE CONCAT('%', #{meteringUnit}, '%')
</if>
+ ORDER BY m.create_time DESC
LIMIT #{pageNo}, #{pageSize}) s
LEFT JOIN measure_ledger l
ON l.`measure_plan_id` = s.`id`
WHERE (l.`state` = 1 OR l.`state` IS NULL)
+ ORDER BY s.createTime DESC
</select>
<select id="selectIdPlan" resultType="map">
--
Gitblit v1.9.3