diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvPreProductDetailRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvPreProductDetailRequest.java index 45ccf4c8..0eea3de3 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterInvPreProductDetailRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterInvPreProductDetailRequest.java @@ -76,4 +76,6 @@ public class FilterInvPreProductDetailRequest extends ListPageRequest { */ private String updateTime; + private String orderBy; + } diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvProductDetailRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvProductDetailRequest.java index c9cda9af..160d5cac 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterInvProductDetailRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterInvProductDetailRequest.java @@ -85,4 +85,6 @@ public class FilterInvProductDetailRequest extends ListPageRequest { * 失效日期 */ private String expireDate; + + private String orderBy; } diff --git a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml index 566069aa..b1fd31c8 100644 --- a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml @@ -371,7 +371,8 @@ auth_warehouse.name, auth_warehouse.parentId, auth_warehouse.parentCode, - auth_dept.name warehouseName + auth_dept.name warehouseName, + auth_warehouse.advanceType from auth_warehouse inner join auth_dept on auth_warehouse.parentId = auth_dept.code LEFT join auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code diff --git a/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml index 7cdf1c38..a6848e36 100644 --- a/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml @@ -51,6 +51,16 @@ AND updateTime #{updateTime} + + + + order by ${orderBy} ${sort} + + + ORDER BY updateTime DESC + + + diff --git a/src/main/resources/mybatis/mapper/inv/InvPreProductDetailDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreProductDetailDao.xml index 1dc755be..560680ab 100644 --- a/src/main/resources/mybatis/mapper/inv/InvPreProductDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvPreProductDetailDao.xml @@ -51,6 +51,16 @@ AND updateTime #{updateTime} + + + + + order by ${orderBy} ${sort} + + + ORDER BY updateTime DESC + + diff --git a/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml index bf4eae52..041ea0ae 100644 --- a/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml @@ -60,6 +60,15 @@ AND updateTime #{updateTime} + + + + order by ${orderBy} ${sort} + + + ORDER BY updateTime DESC + +