From 4b276d865ea120dd71265350262e1fc41f360b21 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Thu, 11 Jun 2026 19:21:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/longchuang/ProductionPlanMapper.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/longchuang/ProductionPlanMapper.xml b/src/main/resources/mapper/longchuang/ProductionPlanMapper.xml
index 499e91a..45305eb 100644
--- a/src/main/resources/mapper/longchuang/ProductionPlanMapper.xml
+++ b/src/main/resources/mapper/longchuang/ProductionPlanMapper.xml
@@ -77,7 +77,7 @@
                 and a.plan_finish_date <![CDATA[<=]]> #{query.planEndDate}
             </if>
         </where>
-        order by a.create_time desc, a.order_no desc
+        order by isnull(a.plan_delivery_date, a.plan_finish_date) desc, a.create_time desc, a.order_no desc
     </select>
 
     <select id="queryWorkReportOrderPage" resultType="com.xujie.sys.modules.longchuang.data.ProductionPlanOrderRowData">
@@ -132,7 +132,7 @@
                 and a.plan_finish_date <![CDATA[<=]]> #{query.planEndDate}
             </if>
         </where>
-        order by a.create_time desc, a.order_no desc
+        order by isnull(a.plan_delivery_date, a.plan_finish_date) desc, a.create_time desc, a.order_no desc
     </select>
 
     <select id="queryOrderNodeList" resultType="com.xujie.sys.modules.longchuang.data.ProductionPlanOrderNodeData">