单据排序

src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java

@@ -188,5 +188,6 @@ public class FilterOrderRequest extends ListPageRequest {
     private String supInoivceSearch;
     private List<String> invoiceActions1;
     private List<String> invoiceActions2;
+    private String orderBy;
 
 }

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

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

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;
 
 
 

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;
 
 
 

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -722,6 +722,7 @@ public class IoOrderServiceImpl implements IoOrderService {
     @Override
     public List<IoOrderEntity> filterOrderTrace(String billNo) {
         IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().eq("billNo", billNo));
+
         if (null == order) {
             return Collections.emptyList();
         }

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -135,7 +135,14 @@
                 </if>
             </if>
         </where>
-        order by createTime desc
+        <choose>
+            <when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
+                order by ${orderBy}   ${sort}
+            </when>
+            <otherwise>
+                order by updateTime desc
+            </otherwise>
+        </choose>
     </select>
 
 
@@ -283,7 +290,14 @@
                 </if>
             </if>
         </where>
-        order by createTime desc
+        <choose>
+            <when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
+                order by ${orderBy}   ${sort}
+            </when>
+            <otherwise>
+                order by updateTime desc
+            </otherwise>
+        </choose>
     </select>
 
     <select id="filterOrderList" resultType="com.glxp.api.entity.inout.IoOrderEntity">

src/main/resources/mybatis/mapper/inout/ReceiveDao.xml

@@ -56,5 +56,15 @@
                 AND (status=3 or status=4)
             </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>
 </mapper>

src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml

@@ -68,7 +68,14 @@
                 AND emergency = #{emergency}
             </if>
         </where>
-       order by pur_apply.updateTime desc
+        <choose>
+            <when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
+                order by ${orderBy}   ${sort}
+            </when>
+            <otherwise>
+                ORDER BY updateTime DESC
+            </otherwise>
+        </choose>
     </select>
 
     <insert id="insert" keyProperty="id" keyColumn="id"

src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml

@@ -97,6 +97,13 @@
                 AND emergency = #{emergency}
             </if>
         </where>
-        order by pur_order.updateTime desc
+        <choose>
+            <when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
+                order by ${orderBy}   ${sort}
+            </when>
+            <otherwise>
+                order by pur_order.updateTime desc
+            </otherwise>
+        </choose>
     </select>
 </mapper>

src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml

@@ -62,7 +62,14 @@
                 AND emergency = #{emergency}
             </if>
         </where>
-        order by pur_plan.updateTime desc
+        <choose>
+            <when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
+                order by ${orderBy}   ${sort}
+            </when>
+            <otherwise>
+                ORDER BY pur_plan.updateTime DESC
+            </otherwise>
+        </choose>
     </select>
 
     <insert id="insert" keyProperty="id"