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 c869a81a5..b8f3284bd 100644 --- a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java +++ b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java @@ -84,5 +84,9 @@ public class CollectOrderRequest extends ListPageRequest { private List tagStatusList; + private Integer tagStatus; + + private String workplaceName; + } diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml index 14df0f328..839a7a266 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml @@ -16,6 +16,9 @@ AND billNo LIKE concat('%', #{billNo}, '%') + + AND workplaceName LIKE concat('%', #{workplaceName}, '%') + AND busType = #{busType} @@ -31,6 +34,9 @@ AND busType = #{busType} + + AND tagStatus = #{tagStatus} + AND workPlaceCode = #{workPlaceCode}