From 3e79cc1cfaca5c4fea09fc46c6de149a2efcaa35 Mon Sep 17 00:00:00 2001 From: yuejiayang <146344614+YangLei105@users.noreply.github.com> Date: Fri, 28 Jun 2024 02:17:02 +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 --- .../xujie/sys/modules/pms/data/ProofDocumentData.java | 10 ++++++++++ .../resources/mapper/pms/ProofingInformationMapper.xml | 5 +++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/pms/data/ProofDocumentData.java b/src/main/java/com/xujie/sys/modules/pms/data/ProofDocumentData.java index 47cc757b..ed6e8c76 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/ProofDocumentData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/ProofDocumentData.java @@ -26,6 +26,8 @@ public class ProofDocumentData extends ProofingInformationData { private String documentType; + private String documentDesc; + private String responsibleDepartment; private String estimatedCompletionDays; @@ -216,4 +218,12 @@ public class ProofDocumentData extends ProofingInformationData { public void setOrderRef1(String orderRef1) { this.orderRef1 = orderRef1; } + + public String getDocumentDesc() { + return documentDesc; + } + + public void setDocumentDesc(String documentDesc) { + this.documentDesc = documentDesc; + } } diff --git a/src/main/resources/mapper/pms/ProofingInformationMapper.xml b/src/main/resources/mapper/pms/ProofingInformationMapper.xml index 40e4dc69..7fd25288 100644 --- a/src/main/resources/mapper/pms/ProofingInformationMapper.xml +++ b/src/main/resources/mapper/pms/ProofingInformationMapper.xml @@ -89,7 +89,8 @@ a.create_date, a.created_by, a.update_date, - a.update_by + a.update_by, + c.document_desc FROM plm_document_list_definition as a LEFT JOIN plm_project_info as d ON a.project_id = d.project_id and a.site = d.site left join plm_customer_information as e on e.customer_no = d.customer_no and e.site = d.site @@ -140,7 +141,7 @@ WHERE site = #{site} AND bu_no = #{buNo} AND project_category = #{cProjectTypeDb} - AND (project_phase = 'Sample' OR project_phase = 'Sample Order') + AND (project_phase = 'Sample' OR project_phase = 'Mass Production')