diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java index 554f7abed..5e1a3d7b5 100644 --- a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java +++ b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java @@ -141,4 +141,9 @@ public class CollectOrderRequest extends ListPageRequest { private List documentTypeCodes; + /** + * 关键字搜索 + */ + private String keywords; + } diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml index fa8d5e8df..2b318886d 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml @@ -107,6 +107,15 @@ and ico.uploadStatus = #{uploadStatus} + + 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}, '%')) + GROUP BY ico.billNo diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml index 311e9902c..2f70bc83d 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml @@ -107,6 +107,12 @@ AND date_format(ico.billTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d') + + and (ico.billNo like concat('%', #{keywords}, '%') + or ico.fromCorp like concat('%', #{keywords}, '%') + or ico.fromCorpName like concat('%', #{keywords}, '%') + or ico.fromType like concat('%', #{keywords}, '%')) + GROUP BY ico.billNo @@ -115,4 +121,4 @@ - \ No newline at end of file +