From 82fadb3e7dc7ef8520e0cddb7dac9185cbb72b0f Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 7 Jun 2023 18:05:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/req/inout/FilterOrderRequest.java  |  1 +
 .../com/glxp/api/req/purchase/PurOrderRequest.java  |  1 +
 .../resources/mybatis/mapper/inout/IoOrderDao.xml   | 13 ++++++++++---
 .../mybatis/mapper/purchase/PurOrderDao.xml         |  9 +++++++++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
index 0e785c35..b84784f3 100644
--- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
@@ -188,5 +188,6 @@ public class FilterOrderRequest extends ListPageRequest {
     private String supInoivceSearch;
     private List<String> invoiceActions1;
     private List<String> invoiceActions2;
+    private String orderBy;
 
 }
diff --git a/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java b/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java
index 845c4dc8..1bd594b9 100644
--- a/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java
@@ -99,5 +99,6 @@ public class PurOrderRequest extends ListPageRequest {
     private String startAuditDate;
     private String endAuditDate;
     private Integer dealStatus;
+    private String orderBy;
 
 }
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index f7b8142f..4f6bc310 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -274,7 +274,6 @@
                 </if>
             </if>
         </where>
-        order by createTime desc
     </select>
 
 
@@ -331,7 +330,7 @@
                 ]]>
             </if>
         </where>
-        order by createTime desc
+
     </select>
 
 
@@ -545,7 +544,15 @@
             </if>
         </where>
         GROUP BY io.id
-        order by io.createTime desc
+        <choose>
+            <when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
+                order by ${orderBy}   ${sort}
+            </when>
+            <otherwise>
+                order by updateTime desc
+            </otherwise>
+        </choose>
+
     </select>
 
 
diff --git a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml
index acf4c3d0..d7e487e0 100644
--- a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml
@@ -102,5 +102,14 @@
                 AND createUser = #{createUser}
             </if>
         </where>
+        <choose>
+            <when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
+                order by ${orderBy}   ${sort}
+            </when>
+            <otherwise>
+                order by pur_order.updateTime desc
+            </otherwise>
+        </choose>
+
     </select>
 </mapper>