From 207823b94f5627fae49d29b51b5ce7186a70c8e0 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 04 一月 2025 09:59:48 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/OrderMapper.xml |   73 ++++++++++++++++++++++++++++++++++--
 1 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 04ddf89..aa68d52 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -65,7 +65,70 @@
         where 1=1
         and settle = 4
         and status = 1
-        order by create_time asc
+        order by update_time asc
+    </select>
+
+    <select id="selectCompleteSave" resultMap="BaseResultMap">
+        select top 5 *
+        from man_order
+        where 1=1
+          and settle = 5
+          and status = 1
+        order by update_time asc
+    </select>
+
+    <select id="selectComplete1" resultMap="BaseResultMap">
+        select top 5 *
+        from man_order
+        where 1=1
+        and settle = 6
+        and status = 1
+        order by update_time asc
+    </select>
+
+    <select id="selectComplete2" resultMap="BaseResultMap">
+        select top 5 *
+        from man_order
+        where 1=1
+        and settle = 7
+        and status = 1
+        order by update_time asc
+    </select>
+
+    <select id="selectCompleteMome0" resultMap="BaseResultMap">
+        select top 5 *
+        from man_order
+        where 1=1
+          and memo = '0'
+          and status = 1
+        order by update_time asc
+    </select>
+
+    <select id="selectCompleteMome1" resultMap="BaseResultMap">
+        select top 5 *
+        from man_order
+        where 1=1
+          and memo = '1'
+          and status = 1
+        order by update_time asc
+    </select>
+
+    <select id="selectCompleteMome2" resultMap="BaseResultMap">
+        select top 5 *
+        from man_order
+        where 1=1
+          and memo = '2'
+          and status = 1
+        order by update_time asc
+    </select>
+
+    <select id="selectCompleteMome3" resultMap="BaseResultMap">
+        select top 5 *
+        from man_order
+        where 1=1
+          and memo = '3'
+          and status = 1
+        order by update_time asc
     </select>
     <select id="selectInOrOutOrders" resultMap="BaseResultMap">
         SELECT * FROM man_order o left join man_doc_type d on o.doc_type = d.doc_id WHERE d.pakin = #{flag} and o.settle in (1,2)
@@ -82,19 +145,19 @@
         select order_no from man_order
     </select>
     <sql id="orderSql">
-        <if test="order_no != null and order_no!='' ">
-            and a.order_no like '%' + #{order_no} + '%'
+        <if test="orderNo != null and orderNo!='' ">
+            and order_no like '%' + #{orderNo} + '%'
         </if>
     </sql>
     <select id="getOrderAll" resultMap="BaseResultMap">
         select t.row,order_all.* from
             (
             select
-            ROW_NUMBER() over (order by sum(1) desc) as row,id
+            ROW_NUMBER() over (order by order_time desc) as row,id
             FROM order_all
             WHERE 1=1
             <include refid="orderSql"></include>
-            GROUP BY id
+            GROUP BY id,order_time
             ) t
             LEFT JOIN order_all ON t.id = order_all.id
             where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})

--
Gitblit v1.9.1