diff --git a/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java b/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java index acdb440ec..136887635 100644 --- a/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java +++ b/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java @@ -43,6 +43,12 @@ public class SysWorkplaceQueueRequest extends ListPageRequest { private String relId; + private String keyWords; + + private String ggxh; + + private String cpmctymc; + diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml index 9e52beb4c..82fff607a 100644 --- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml @@ -57,8 +57,26 @@ bp.nameCode like concat('%', #{nameCode}, '%') ) + + AND ( + bp.cpmctymc like concat('%', #{cpmctymc}, '%') + ) + + + AND ( + bp.ggxh like concat('%', #{ggxh}, '%') + or bp.bzgg like concat('%', #{ggxh}, '%') + ) + - AND layerCode = #{layerCode} + AND ( + layerCode like concat('%', #{layerCode}, '%') + ) + + + AND ( + freightCode like concat('%', #{freightCode}, '%') + ) AND swq.code = #{code} @@ -72,6 +90,15 @@ #{item} + + AND ( + bp.nameCode like concat('%', #{keyWords}, '%') + or bp.cpmctymc like concat('%', #{keyWords}, '%') + or bp.ggxh like concat('%', #{keyWords}, '%') + or bp.bzgg like concat('%', #{keyWords}, '%') + or layerCode like concat('%', #{keyWords}, '%') + or freightCode like concat('%', #{keyWords}, '%')) + GROUP BY swq.code