Merge remote-tracking branch 'origin/dev' into dev

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

@@ -197,4 +197,5 @@ public class FilterOrderRequest extends ListPageRequest {
     private String unionRemark;
 
     private String remark;
+    private Integer confirmStatus;
 }

src/main/java/com/glxp/api/req/inv/InnerOrderDetailRequest.java

@@ -9,5 +9,6 @@ public class InnerOrderDetailRequest extends ListPageRequest {
     private String orderIdFk;
     private String productId;
     private String billNo;
+    private String nameCode;
 
 }

src/main/java/com/glxp/api/res/inout/IoOrderResponse.java

@@ -230,7 +230,7 @@ public class IoOrderResponse {
 
     //总金额
     private BigDecimal allAmount;
-
+    private Integer confirmStatus;
 
     /**
      * 校验信息

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

@@ -503,6 +503,9 @@
                      LEFT JOIN basic_corp bc ON io.fromCorp = bc.erpId
                      LEFT JOIN io_order_detail_code dc ON io.billNo = dc.orderIdFk
         <where>
+            <if test="confirmStatus != null and confirmStatus != ''">
+                AND io.checkStatus = #{confirmStatus}
+            </if>
             <if test="id != null and id != ''">
                 AND io.id = #{id}
             </if>
@@ -630,7 +633,7 @@
                 order by ${orderBy} ${sort}
             </when>
             <otherwise>
-                order by updateTime desc
+                order by checkStatus asc,updateTime desc
             </otherwise>
         </choose>
     </select>