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 a0ec9242d..c7c890504 100644 --- a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java +++ b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java @@ -120,12 +120,12 @@ public class CollectOrderRequest extends ListPageRequest { private List invAlerts; /** - *上传状态(1.未上传,2.已上传,3.上传失败) + * 上传状态(1.未上传,2.已上传,3.上传失败) */ private Integer uploadStatus; /** - *上传错误信息 + * 上传错误信息 */ private String updateError; @@ -147,4 +147,6 @@ public class CollectOrderRequest extends ListPageRequest { */ private String keywords; + private String excludeWorkCode; + } diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml index 24f676a16..3f8d7fb29 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml @@ -62,6 +62,11 @@ AND ico.workPlaceCode = #{workPlaceCode} + + + AND ico.workPlaceCode!=null and ico.workPlaceCode not in (#{excludeWorkCode}) + + AND sw.chargeUser = #{chargeUser}