diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamDocumentTypeData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamDocumentTypeData.java index ae0991ab..314def2b 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/EamDocumentTypeData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/EamDocumentTypeData.java @@ -17,6 +17,10 @@ public class EamDocumentTypeData extends QueryPage { * bu */ private String buNo; + /** + * 工厂描述 + */ + private String sitename; /** * 文档类型ID @@ -105,6 +109,14 @@ public class EamDocumentTypeData extends QueryPage { this.buNo = buNo; } + public String getSitename() { + return sitename; + } + + public void setSitename(String sitename) { + this.sitename = sitename; + } + public String getBu() { return bu; } diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml index 597401e9..f951812e 100644 --- a/src/main/resources/mapper/pms/EamMapper.xml +++ b/src/main/resources/mapper/pms/EamMapper.xml @@ -3681,6 +3681,7 @@ SELECT a.site, + c.sitename, a.document_type_id, a.document_type, a.responsible_department, @@ -3711,9 +3714,13 @@ a.update_by, b.role_desc FROM document_type_definition as a + LEFT JOIN site as c on a.site = c.siteid LEFT JOIN business_role as b on a.site = b.site and a.responsible_department = b.role_no WHERE a.site in (select eas.site from eam_access_site as eas where eas.username = #{query.userName}) + + AND UPPER(c.sitename) LIKE '%' + UPPER(#{query.sitename}) + '%' + AND UPPER(a.document_type_id) LIKE '%' + UPPER(#{query.documentTypeId}) + '%'