修改bug 寄售 预验收 带票库存详情加排序

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;
+
 }

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;
 }

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

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">

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">

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">