9/17 字段搜索优化1.0

src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java

@@ -149,4 +149,8 @@ public class CollectOrderRequest extends ListPageRequest {
 
     private String excludeWorkCode;
 
+    //发货方
+    private String shipperName;
+
+
 }

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

@@ -21,6 +21,9 @@
         icob.invAlert,
         icob.splitMsg,
         icob.fromCorpName,
+        icob.shipperName,
+        icob.thrBusType,
+        icob.shipper,
         icob.tagMsg,
         sys_workplace_document.busName busTypeName,
         sw.workplaceName,
@@ -108,6 +111,12 @@
                 or icob.busType like concat('%', #{keywords}, '%')
                 or icob.fromType like concat('%', #{keywords}, '%'))
             </if>
+            <if test="shipperName != '' and shipperName != null">
+                AND icob.shipperName LIKE concat('%', #{shipperName}, '%')
+            </if>
+            <if test="fromCorpName != '' and fromCorpName != null">
+                AND icob.fromCorpName LIKE concat('%', #{fromCorpName}, '%')
+            </if>
         </where>
         GROUP BY
         icob.billNo

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

@@ -123,6 +123,12 @@
                 or ico.fromCorpName like concat('%', #{keywords}, '%')
                 or ico.fromType like concat('%', #{keywords}, '%'))
             </if>
+            <if test="shipperName != '' and shipperName != null">
+                AND ico.shipperName LIKE concat('%', #{shipperName}, '%')
+            </if>
+            <if test="fromCorpName != '' and fromCorpName != null">
+                AND ico.fromCorpName LIKE concat('%', #{fromCorpName}, '%')
+            </if>
         </where>
         GROUP BY
         ico.billNo

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

@@ -96,6 +96,12 @@
             <if test="fromType != '' and fromType != null">
                 AND fromType LIKE concat('%', #{fromType}, '%')
             </if>
+            <if test="shipperName != '' and shipperName != null">
+                AND ico.shipperName LIKE concat('%', #{shipperName}, '%')
+            </if>
+            <if test="fromCorpName != '' and fromCorpName != null">
+                AND ico.fromCorpName LIKE concat('%', #{fromCorpName}, '%')
+            </if>
             <if test="collectCode != null and collectCode != ''">
                 AND collectCode = #{collectCode}
             </if>