From 1f2dcfda473b6ff31ee5de56a21680db1e95c685 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Fri, 5 Jan 2024 16:29:17 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E4=BB=BB=E5=8A=A1=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/device/EquOrderMapper.xml      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
index 6f3e7531..114dfa96 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
@@ -182,8 +182,10 @@
 		  and eo.order_status != '1'
 		  and eo.order_code in (select order_code
 								from equ_order_person
-								where del_flag = '0' and user_name = #{userId}
+								where del_flag = '0'
+								  and user_name = #{userId}
 								GROUP BY order_code)
+		order by eo.plan_loop_type, eo.plan_loop, eo.create_time, eo.equipment_code
 	</select>
 
 	<select id="selectTaskRecord" parameterType="String" resultMap="EquOrderResult">
@@ -191,6 +193,7 @@
 		where del_flag = '0' and order_status = '1' and plan_type = #{planType} and plan_person = #{userId} and order_code in (
 		select order_code from equ_order_person where del_flag = '0' and user_name = #{userId} GROUP BY order_code
 		)
+		order by update_time desc
 	</select>
 
 	<select id="selectEquipmentNameByEquCode" resultType="java.lang.String">