11/14 槽位管理高级搜索

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;
+
 
 
 

src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml

@@ -57,8 +57,26 @@
                 bp.nameCode like concat('%', #{nameCode}, '%')
                 )
             </if>
+            <if test="cpmctymc != null and cpmctymc != ''">
+                AND (
+                bp.cpmctymc like concat('%', #{cpmctymc}, '%')
+                )
+            </if>
+            <if test="ggxh != null and ggxh != ''">
+                AND (
+                bp.ggxh like concat('%', #{ggxh}, '%')
+                or bp.bzgg like concat('%', #{ggxh}, '%')
+                )
+            </if>
             <if test=" layerCode != null and layerCode != ''">
-                AND layerCode = #{layerCode}
+                AND (
+                layerCode like concat('%', #{layerCode}, '%')
+                )
+            </if>
+            <if test=" freightCode != null and freightCode != ''">
+                AND (
+                freightCode like concat('%', #{freightCode}, '%')
+                )
             </if>
             <if test=" code != null and code != ''">
                 AND swq.code = #{code}
@@ -72,6 +90,15 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="keyWords != null and keyWords != '' ">
+                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}, '%'))
+            </if>
         </where>
         GROUP BY swq.code
     </select>