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 invoiceActions1; private List 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 @@ - order by createTime desc @@ -331,7 +330,7 @@ ]]> - order by createTime desc + @@ -545,7 +544,15 @@ GROUP BY io.id - order by io.createTime desc + + + order by ${orderBy} ${sort} + + + order by updateTime desc + + + 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} + + + order by ${orderBy} ${sort} + + + order by pur_order.updateTime desc + + +