diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java
index a085a7e9..b3204220 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java
@@ -52,5 +52,11 @@ public class BomNewEbomParentQuery extends BasePageQuery implements Serializabl
@ApiModelProperty(value = "是否仅显示自己的数据:0=所有人的数据;1=仅自己的数据,默认为0")
private Integer showMySelfOnly = 0;
+ /**
+ * 通知单号
+ */
+ @ApiModelProperty(value = "通知单号")
+ private String noticeNo;
+
private static final long serialVersionUID = 1L;
}
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
index 133571f7..178ee084 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
@@ -75,7 +75,10 @@
and material_no=#{query.materialNo}
- and devise_name=#{query.deviseName}
+ and devise_name LIKE concat('%', #{query.deviseName}, '%')
+
+
+ AND notice_nums LIKE concat('%', #{query.noticeNo}, '%')
and created_time between #{query.startDate} and DATE_ADD(#{query.endDate}, INTERVAL 1 DAY)
@@ -419,11 +422,14 @@
root_is_for_wait_review=1) AND created_by=#{userCode})
- AND devise_name=#{query.deviseName}
+ AND devise_name LIKE concat('%', #{query.deviseName}, '%')
AND created_time BETWEEN #{query.startDate} AND DATE_ADD(#{query.endDate}, INTERVAL 1 DAY)
+
+ AND notice_nums LIKE concat('%', #{query.noticeNo}, '%')
+
order by row_id desc