diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java index 4dca2fd26..dca7c3db3 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java @@ -199,7 +199,7 @@ public class FilterOrderRequest extends ListPageRequest { private String unionRemark; private String remark; - private String keyWords; + private String keywords; private Integer confirmStatus; private Boolean filterSelected; private List inOrders; 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 c8297c8fa..c39102832 100644 --- a/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java +++ b/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java @@ -134,6 +134,10 @@ public class IoSplitCodeRequest extends ListPageRequest { * 工位 */ private Long workPlaceCode; + /** + * 关键字搜索 + */ + private String keywords; diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index 51284fb6b..7e99b4b4b 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -54,9 +54,9 @@ AND io.productType = #{productType} - - AND (aw.name like concat('%', #{keyWords}, '%') or bc.name like concat('%', #{keyWords}, '%')) - + + + AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like @@ -191,6 +191,13 @@ AND io.fromPatientCode = #{fromPatientCode} + + and (io.billNo like concat('%', #{keywords}, '%') + or io.fromCorp like concat('%', #{keywords}, '%') + or io.workPlaceCode like concat('%', #{keywords}, '%') + or io.busType like concat('%', #{keywords}, '%') + or io.fromType like concat('%', #{keywords}, '%')) + diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml index fe814c71f..425e9c5a8 100644 --- a/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml +++ b/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml @@ -39,6 +39,13 @@ AND workPlaceCode = #{workPlaceCode} + + 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 isc.invCode like concat('%', #{keywords}, '%')) +