From 6e2d85ed76d7edaa65fabdb6eb98c5378f18db34 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 8 May 2023 16:46:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=20=E5=AF=84=E5=94=AE=20?=
 =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=20=E5=B8=A6=E7=A5=A8=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E8=AF=A6=E6=83=85=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/req/inv/FilterInvPreProductDetailRequest.java  |  2 ++
 .../api/req/inv/FilterInvProductDetailRequest.java     |  2 ++
 .../resources/mybatis/mapper/auth/InvWarehouseDao.xml  |  3 ++-
 .../mybatis/mapper/inv/InvPreInProductDetailDao.xml    | 10 ++++++++++
 .../mybatis/mapper/inv/InvPreProductDetailDao.xml      | 10 ++++++++++
 .../mybatis/mapper/inv/invProductDetailDao.xml         |  9 +++++++++
 6 files changed, 35 insertions(+), 1 deletion(-)

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 <![CDATA[ <= ]]> #{updateTime}
             </if>
         </where>
+
+        <choose>
+            <when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
+                order by ${orderBy}   ${sort}
+            </when>
+            <otherwise>
+                ORDER BY updateTime DESC
+            </otherwise>
+        </choose>
+
     </select>
 
     <delete id="deleteInvPreProductDetail">
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 <![CDATA[ <= ]]> #{updateTime}
             </if>
         </where>
+
+
+        <choose>
+            <when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
+                order by ${orderBy}   ${sort}
+            </when>
+            <otherwise>
+                ORDER BY updateTime DESC
+            </otherwise>
+        </choose>
     </select>
 
     <delete id="deleteInvPreProductDetail">
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 <![CDATA[ <= ]]> #{updateTime}
             </if>
         </where>
+
+        <choose>
+            <when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
+                order by ${orderBy}   ${sort}
+            </when>
+            <otherwise>
+                ORDER BY updateTime DESC
+            </otherwise>
+        </choose>
     </select>
 
     <delete id="deleteInvProductDetail">