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 0e785c355..b84784f3b 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/inout/FilterReceiveRequest.java b/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java index f044a9b26..5b22e8597 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java @@ -36,6 +36,7 @@ public class FilterReceiveRequest extends ListPageRequest { private String targetInvCode; private Integer type; + private String orderBy; } diff --git a/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java b/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java index ca33868c1..1e8981371 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java @@ -107,4 +107,5 @@ public class PurApplyRequest extends ListPageRequest { private Date arrivalTime; private String startAuditDate; private String endAuditDate; + 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 6621f8c6f..7e6da5cc4 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java @@ -95,6 +95,7 @@ public class PurOrderRequest extends ListPageRequest { private Date arrivalTime; private String startAuditDate; private String endAuditDate; + private String orderBy; diff --git a/src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java b/src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java index ec4d1bc94..b6602eb26 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java @@ -95,6 +95,7 @@ public class PurPlanRequest extends ListPageRequest { private Date arrivalTime; private String startAuditDate; private String endAuditDate; + private String orderBy; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 8b6655357..e3d18a38e 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -722,6 +722,7 @@ public class IoOrderServiceImpl implements IoOrderService { @Override public List filterOrderTrace(String billNo) { IoOrderEntity order = orderDao.selectOne(new QueryWrapper().eq("billNo", billNo)); + if (null == order) { return Collections.emptyList(); } diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index a13bd129f..dbae1ed54 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -135,7 +135,14 @@ - order by createTime desc + + + order by ${orderBy} ${sort} + + + order by updateTime desc + + @@ -283,7 +290,14 @@ - order by createTime desc + + + order by ${orderBy} ${sort} + + + order by updateTime desc + + diff --git a/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml index 528de21ac..e809b244e 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml @@ -68,7 +68,14 @@ AND emergency = #{emergency} - order by pur_apply.updateTime desc + + + order by ${orderBy} ${sort} + + + ORDER BY updateTime DESC + + - order by pur_order.updateTime desc + + + order by ${orderBy} ${sort} + + + order by pur_order.updateTime desc + + diff --git a/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml b/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml index fe93b3a07..b2d2d3148 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml @@ -62,7 +62,14 @@ AND emergency = #{emergency} - order by pur_plan.updateTime desc + + + order by ${orderBy} ${sort} + + + ORDER BY pur_plan.updateTime DESC + +