9/18 字段查询优化

src/main/java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java

@@ -121,6 +121,10 @@ public class IoSplitFifoInvRequest extends ListPageRequest {
 
     private String remind;
     private String cpmctymc;
+    //批准文号 || 注册备案证号
+    private String zczbhhzbapzbh;
+    //生产企业
+    private String ylqxzcrbarmc;
 
 
 }

src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml

@@ -12,6 +12,7 @@
                ico.orderCirType,
                ico.createTime,
                ico.workPlaceCode,
+               ico.shipperName,
                ico.remark,
                ico.createUser,
                ico.updateTime,

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -196,6 +196,7 @@
                 or io.fromCorp like concat('%', #{keywords}, '%')
                 or io.workPlaceCode like concat('%', #{keywords}, '%')
                 or io.busType like concat('%', #{keywords}, '%')
+                or sw.workplaceName like concat('%', #{keywords}, '%')
                 or io.fromType like concat('%', #{keywords}, '%'))
             </if>
 

src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml

@@ -57,6 +57,14 @@
           <if test="nameCode != '' and nameCode != null">
               AND bp.nameCode = #{nameCode}
           </if>
+          <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
+              AND bp.zczbhhzbapzbh like concat('%', #{zczbhhzbapzbh}, '%')
+          </if>
+          <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+              AND (
+              bp.ylqxzcrbarmc like concat('%', #{ylqxzcrbarmc}, '%')
+              or bp.manufactory like concat('%', #{ylqxzcrbarmc}, '%'))
+          </if>
           <if test="batchNo != '' and batchNo != null">
               AND isfi.batchNo = #{batchNo}
           </if>