diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java index 73ee218df..09f6266e5 100644 --- a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java +++ b/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; diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml index 8735dd61b..698e996e9 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml @@ -101,6 +101,12 @@ and icob.invAlert = #{invAlert} + + and sys_workplace_document.isMatching = #{isMatching} + + + and sys_workplace_document.inAndOutType = #{inAndOutType} + and icob.invAlert in