4/8 优化选入已完成单据1.0

src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java

@@ -183,6 +183,9 @@ public class CollectOrderRequest extends ListPageRequest {
     private String orderStartTime;
     private String orderEndTime;
 
+    private Integer isMatching;
+
+    private Integer inAndOutType;
 
 
 

src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml

@@ -101,6 +101,12 @@
             <if test="invAlert != null">
                 and icob.invAlert = #{invAlert}
             </if>
+            <if test="isMatching != null">
+                and sys_workplace_document.isMatching = #{isMatching}
+            </if>
+            <if test="inAndOutType != null">
+                and sys_workplace_document.inAndOutType = #{inAndOutType}
+            </if>
             <if test="invAlerts != null and invAlerts.size() > 0">
                 and icob.invAlert in
                 <foreach collection="invAlerts" item="item" index="index" separator="," open="(" close=")">