diff --git a/src/main/java/com/glxp/api/req/sync/BasicExportStatusRequest.java b/src/main/java/com/glxp/api/req/sync/BasicExportStatusRequest.java index 8ee5134e..713fab84 100644 --- a/src/main/java/com/glxp/api/req/sync/BasicExportStatusRequest.java +++ b/src/main/java/com/glxp/api/req/sync/BasicExportStatusRequest.java @@ -13,4 +13,5 @@ public class BasicExportStatusRequest extends ListPageRequest { public Integer createType; private String syncTime; private String receiveStatus; + 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 52d54744..428fc6ec 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 @@ -140,7 +140,7 @@ public class IoOrderServiceImpl implements IoOrderService { @Override public List findByStatus(String action, Integer status, Date lastUpdateTime) { - return orderDao.selectList(new QueryWrapper().eq("action", action).eq("status", status).gt("updateTime", lastUpdateTime)); + return orderDao.selectList(new QueryWrapper().eq("action", action).eq("status", status).le(lastUpdateTime != null, "updateTime", lastUpdateTime)); }