diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java index ba50fc9c..78405e27 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java @@ -58,4 +58,11 @@ public class FilterOrderDetailResultRequest extends ListPageRequest { private List list; private Integer productType = 1;//默认耗材 + + private String keyWords; + private String cpmctymc; + private String ggxh; + private String prepnSpec; + + } diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml index e300fbee..6e99364f 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml @@ -84,6 +84,17 @@ AND a2.batchNo like concat('%', #{batchNo}, '%') + ggxh + + AND bp.cpmctymc like concat('%', #{cpmctymc}, '%') + + + AND ( + bp.ggxh LIKE concat('%', #{ggxh}, '%') + or bp.bzgg LIKE concat('%', #{ggxh}, '%')) + + + AND bp.prepnSpec LIKE concat('%', #{prepnSpec}, '%') AND a2.coName like concat('%', #{coName}, '%') @@ -97,6 +108,18 @@ #{item} + + AND ( + a2.nameCode LIKE concat('%', #{keyWords}, '%') + or a2.orderIdFk LIKE concat('%', #{keyWords}, '%') + or bp.bzgg LIKE concat('%', #{keyWords}, '%') + or bp.prepnSpec LIKE concat('%', #{keyWords}, '%') + or bp.cpmctymc LIKE concat('%', #{keyWords}, '%') + or bp.ggxh LIKE concat('%', #{keyWords}, '%') + or a2.batchNo like concat('%', #{keyWords}, '%') + or a2.certCode like concat('%', #{keyWords}, '%') + or a2.manufacturer like concat('%', #{keyWords}, '%')) + group by a2.id