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 6444790e..e5052499 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 @@ -32,6 +32,7 @@ public class EamObjectInData extends EamObjectData { private String orderRef3; private String orderRef4; private String orderRef5; + private String orderRef6; private String fileType; private String searchFlag; @@ -43,6 +44,12 @@ public class EamObjectInData extends EamObjectData { this.searchFlag = searchFlag; } + public String getOrderRef6() {return orderRef6;} + + public void setOrderRef6(String orderRef6) { + this.orderRef6 = orderRef6; + } + public String getOrderRef5() { return orderRef5; } diff --git a/src/main/resources/mapper/oss/SysOssDao.xml b/src/main/resources/mapper/oss/SysOssDao.xml index f1e94cbf..a423b082 100644 --- a/src/main/resources/mapper/oss/SysOssDao.xml +++ b/src/main/resources/mapper/oss/SysOssDao.xml @@ -75,6 +75,7 @@ order_ref2, order_ref3, order_ref4, + order_ref6, file_type, file_suffix, file_type_code, @@ -93,6 +94,9 @@ and order_ref4 = #{orderRef4} + + and order_ref4 = #{orderRef6} + and c_additional_info = #{cAdditionalInfo} diff --git a/src/main/resources/mapper/pms/EamObjectMapper.xml b/src/main/resources/mapper/pms/EamObjectMapper.xml index cda0ac9b..5b5c010e 100644 --- a/src/main/resources/mapper/pms/EamObjectMapper.xml +++ b/src/main/resources/mapper/pms/EamObjectMapper.xml @@ -231,7 +231,8 @@ so.order_ref2, so.order_ref3, so.order_ref4, - so.order_ref5 + so.order_ref5, + so.order_ref6 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