diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamObjectInData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamObjectInData.java
index 80911c36..6444790e 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/EamObjectInData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/EamObjectInData.java
@@ -31,7 +31,25 @@ public class EamObjectInData extends EamObjectData {
private String orderRef2;
private String orderRef3;
private String orderRef4;
+ private String orderRef5;
private String fileType;
+ private String searchFlag;
+
+ public String getSearchFlag() {
+ return searchFlag;
+ }
+
+ public void setSearchFlag(String searchFlag) {
+ this.searchFlag = searchFlag;
+ }
+
+ public String getOrderRef5() {
+ return orderRef5;
+ }
+
+ public void setOrderRef5(String orderRef5) {
+ this.orderRef5 = orderRef5;
+ }
public String getFileType() {
return fileType;
diff --git a/src/main/resources/mapper/pms/EamObjectMapper.xml b/src/main/resources/mapper/pms/EamObjectMapper.xml
index 32f9e00f..9b37d3e9 100644
--- a/src/main/resources/mapper/pms/EamObjectMapper.xml
+++ b/src/main/resources/mapper/pms/EamObjectMapper.xml
@@ -204,7 +204,8 @@
so.order_ref1,
so.order_ref2,
so.order_ref3,
- so.order_ref4
+ so.order_ref4,
+ so.order_ref5
FROM eam_object as eo
LEFT JOIN sys_oss as so ON eo.site = so.order_ref1 and eo.bu_no = so.order_ref4 and eo.ObjectID = so.order_ref2
LEFT JOIN eam_location as el ON eo.site = el.site and eo.LocationID = el.LocationID and eo.bu_no = el.bu_no
@@ -218,6 +219,9 @@
AND dbo.get_bu_desc (eo.site, eo.bu_no) = #{query.buDesc}
+
+ AND so.file_name like '%' + #{query.fileName} +'%'
+
AND eo.ObjectID like '%' + #{query.objectID} +'%'
@@ -239,6 +243,12 @@
AND so.order_ref3 = #{query.orderRef3}
+
+ AND so.file_name is not null
+
+
+ AND so.file_name is null
+