新增关键字搜索

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

@@ -141,4 +141,9 @@ public class CollectOrderRequest extends ListPageRequest {
 
     private List<String> documentTypeCodes;
 
+    /**
+     * 关键字搜索
+     */
+    private String keywords;
+
 }

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

@@ -107,6 +107,15 @@
             <if test="uploadStatus != null">
                 and ico.uploadStatus = #{uploadStatus}
             </if>
+            <if test="keywords != null and keywords != ''">
+                and (ico.billNo like concat('%', #{keywords}, '%')
+                or ico.fromCorp like concat('%', #{keywords}, '%')
+                or ico.fromCorpName like concat('%', #{keywords}, '%')
+                or ico.workPlaceCode like concat('%', #{keywords}, '%')
+                or ico.busType like concat('%', #{keywords}, '%')
+                or ico.fromCorpName like concat('%', #{keywords}, '%')
+                or ico.fromType like concat('%', #{keywords}, '%'))
+            </if>
         </where>
         GROUP BY
         ico.billNo

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

@@ -107,6 +107,12 @@
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND date_format(ico.billTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
             </if>
+            <if test="keywords != null and keywords != ''">
+                and (ico.billNo like concat('%', #{keywords}, '%')
+                    or ico.fromCorp like concat('%', #{keywords}, '%')
+                    or ico.fromCorpName like concat('%', #{keywords}, '%')
+                    or ico.fromType like concat('%', #{keywords}, '%'))
+            </if>
         </where>
         GROUP BY
         ico.billNo
@@ -115,4 +121,4 @@
 
 
 
-</mapper>
+</mapper>