From c5ea711814b368b780ddc6ea62d9c27ce4ffdd4d Mon Sep 17 00:00:00 2001 From: yuejiayang <146344614+YangLei105@users.noreply.github.com> Date: Fri, 28 Jun 2024 03:10:49 +0800 Subject: [PATCH] =?UTF-8?q?2024.6.27=20=E4=BA=A7=E5=93=81=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E6=94=B6=E9=9B=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/modules/base/service/Impl/BaseServiceImpl.java | 1 + .../sys/modules/pms/data/EamDocumentTypeData.java | 10 ++++++++++ src/main/resources/mapper/base/BaseMapper.xml | 4 ++-- .../resources/mapper/pms/ProofingInformationMapper.xml | 2 ++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/base/service/Impl/BaseServiceImpl.java b/src/main/java/com/xujie/sys/modules/base/service/Impl/BaseServiceImpl.java index 7c3eea38..517cfa02 100644 --- a/src/main/java/com/xujie/sys/modules/base/service/Impl/BaseServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/base/service/Impl/BaseServiceImpl.java @@ -124,6 +124,7 @@ public class BaseServiceImpl implements BaseService { proofDocumentData.setOrderRef2(inData.getOrderRef2()); proofDocumentData.setOrderRef3(inData.getOrderRef3()); proofDocumentData.setOrderRef4(inData.getOrderRef4()); + proofDocumentData.setCreatedBy(user.getUsername()); //根据OrderRef1、OrderRef2、OrderRef3、OrderRef4查询是否已存在 List proofDocumentDataList = baseMapper.queryProofDocument(proofDocumentData); //如果存在则更新 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 6a8e602f..2f9d698d 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 @@ -27,6 +27,8 @@ public class EamDocumentTypeData extends QueryPage { */ private String documentType; + private String documentDesc; + /** * 责任部门 */ @@ -180,6 +182,14 @@ public class EamDocumentTypeData extends QueryPage { this.estimatedCompletionDays = estimatedCompletionDays; } + public String getDocumentDesc() { + return documentDesc; + } + + public void setDocumentDesc(String documentDesc) { + this.documentDesc = documentDesc; + } + // public String getActive() { // return active; // } diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml index 13168684..86bb8a5f 100644 --- a/src/main/resources/mapper/base/BaseMapper.xml +++ b/src/main/resources/mapper/base/BaseMapper.xml @@ -64,7 +64,7 @@ values (#{site}, #{roleNo}, #{username}) - insert into plm_document_list_definition (site, proofing_id, document_type_id, project_id, manual_flag) - values (#{orderRef1}, #{orderRef2}, #{orderRef3}, #{orderRef4}, 'N') + insert into plm_document_list_definition (site, proofing_id, document_type_id, project_id, manual_flag,create_date,created_by) + values (#{orderRef1}, #{orderRef2}, #{orderRef3}, #{orderRef4}, 'N',getdate(),#{createdBy}) \ No newline at end of file diff --git a/src/main/resources/mapper/pms/ProofingInformationMapper.xml b/src/main/resources/mapper/pms/ProofingInformationMapper.xml index 7fd25288..bc917d85 100644 --- a/src/main/resources/mapper/pms/ProofingInformationMapper.xml +++ b/src/main/resources/mapper/pms/ProofingInformationMapper.xml @@ -111,10 +111,12 @@ a.project_id, a.document_type_id, b.document_type, + c.document_desc, b.responsible_department, b.estimated_completion_days FROM plm_document_list_definition as a LEFT JOIN document_type_definition as b ON a.document_type_id = b.document_type_id and a.site = b.site + left join CKT_MES_II_REAL.dbo.sys_oss as c on c.order_ref3 = a.document_type_id and c.order_ref2 = a.proofing_id and c.order_ref1 = a.site where a.proofing_id = #{query.proofingNo}