diff --git a/src/main/java/com/xujie/sys/modules/pms/data/ProjectProductionValidationDocumentData.java b/src/main/java/com/xujie/sys/modules/pms/data/ProjectProductionValidationDocumentData.java index 2d4bab07..c9121e64 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/ProjectProductionValidationDocumentData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/ProjectProductionValidationDocumentData.java @@ -15,7 +15,7 @@ import java.util.List; * @return: */ @Data -public class ProjectProductionValidationDocumentData extends QueryPage { +public class ProjectProductionValidationDocumentData extends EamProjectInfoData { private String site; @@ -65,18 +65,6 @@ public class ProjectProductionValidationDocumentData extends QueryPage { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private String confirmedDate; - /** - * 推送日期 - */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private String createDate; - - /** - * 推送人 - */ - private String createBy; - /** * 文件名 */ diff --git a/src/main/java/com/xujie/sys/modules/pms/data/ProofingInformationData.java b/src/main/java/com/xujie/sys/modules/pms/data/ProofingInformationData.java index 34b3e958..c43c54db 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/ProofingInformationData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/ProofingInformationData.java @@ -19,7 +19,7 @@ import java.util.List; * @return: */ @Data -public class ProofingInformationData extends QueryPage { +public class ProofingInformationData extends EamProjectInfoData { private Integer id; private String site; private String buNo; diff --git a/src/main/resources/mapper/pms/AgencyMatterMapper.xml b/src/main/resources/mapper/pms/AgencyMatterMapper.xml index c984f319..6c0140aa 100644 --- a/src/main/resources/mapper/pms/AgencyMatterMapper.xml +++ b/src/main/resources/mapper/pms/AgencyMatterMapper.xml @@ -5,13 +5,13 @@ diff --git a/src/main/resources/mapper/pms/ProofingInformationMapper.xml b/src/main/resources/mapper/pms/ProofingInformationMapper.xml index 67888c47..cbeecae9 100644 --- a/src/main/resources/mapper/pms/ProofingInformationMapper.xml +++ b/src/main/resources/mapper/pms/ProofingInformationMapper.xml @@ -176,7 +176,7 @@ SELECT a.document_type_id, a.document_type, - a.responsible_department, + (SELECT role_desc FROM business_role WHERE role_no = a.responsible_department) AS responsible_department, a.estimated_completion_days FROM document_type_definition as a where @@ -241,21 +241,25 @@