规格

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">