diff --git a/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java b/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java index c39102832..e4955a379 100644 --- a/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java +++ b/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java @@ -139,6 +139,9 @@ public class IoSplitCodeRequest extends ListPageRequest { */ private String keywords; + private String startTime; + private String endTime; + private String productName; diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml index 425e9c5a8..e5e0775a9 100644 --- a/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml +++ b/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml @@ -39,13 +39,22 @@ AND workPlaceCode = #{workPlaceCode} + + AND bp.cpmctymc = #{productName} + and (isc.workPlaceCode like concat('%', #{keywords}, '%') or isc.nameCode like concat('%', #{keywords}, '%') or isc.batchNo like concat('%', #{keywords}, '%') or isc.supId like concat('%', #{keywords}, '%') + or bp.cpmctymc like concat('%', #{keywords}, '%') + or bp.bzgg like concat('%', #{keywords}, '%') + or bp.ggxh like concat('%', #{keywords}, '%') or isc.invCode like concat('%', #{keywords}, '%')) + + AND date_format(isc.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d') +