From fc988c0336817824b85148e775ca36952f46b8b5 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Wed, 30 Oct 2024 21:40:09 +0800
Subject: [PATCH] 2024-10-30

---
 .../modules/proofing/vo/ProofingInformationVo.java       | 2 ++
 .../modules/quotation/vo/QuotationInformationVo.java     | 3 +++
 .../com/spring/modules/test/vo/TestInformationVo.java    | 2 ++
 .../mapper/proofing/ProofingInformationMapper.xml        | 1 +
 .../mapper/quotation/QuotationInformationMapper.xml      | 2 ++
 src/main/resources/mapper/test/TestInformationMapper.xml | 9 ++++++++-
 6 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/spring/modules/proofing/vo/ProofingInformationVo.java b/src/main/java/com/spring/modules/proofing/vo/ProofingInformationVo.java
index 4f3ca648..670a9c73 100644
--- a/src/main/java/com/spring/modules/proofing/vo/ProofingInformationVo.java
+++ b/src/main/java/com/spring/modules/proofing/vo/ProofingInformationVo.java
@@ -74,4 +74,6 @@ public class ProofingInformationVo extends ProofingInformationEntity {
     private String finalPartNo;
 
     private String customerPartNo;
+
+    private String nodeCreateBy;
 }
diff --git a/src/main/java/com/spring/modules/quotation/vo/QuotationInformationVo.java b/src/main/java/com/spring/modules/quotation/vo/QuotationInformationVo.java
index c4fd6eed..f01a28fb 100644
--- a/src/main/java/com/spring/modules/quotation/vo/QuotationInformationVo.java
+++ b/src/main/java/com/spring/modules/quotation/vo/QuotationInformationVo.java
@@ -86,4 +86,7 @@ public class QuotationInformationVo extends QuotationInformationEntity {
     private String finalPartNo;
 
     private String customerPartNo;
+
+    private String nodeCreateBy;
+
 }
diff --git a/src/main/java/com/spring/modules/test/vo/TestInformationVo.java b/src/main/java/com/spring/modules/test/vo/TestInformationVo.java
index d6cb9ce5..9c8ec6bb 100644
--- a/src/main/java/com/spring/modules/test/vo/TestInformationVo.java
+++ b/src/main/java/com/spring/modules/test/vo/TestInformationVo.java
@@ -76,4 +76,6 @@ public class TestInformationVo extends TestInformationEntity {
     private String finalPartNo;
 
     private String customerPartNo;
+
+    private String nodeCreateBy;
 }
diff --git a/src/main/resources/mapper/proofing/ProofingInformationMapper.xml b/src/main/resources/mapper/proofing/ProofingInformationMapper.xml
index f3c326e0..fa8525f9 100644
--- a/src/main/resources/mapper/proofing/ProofingInformationMapper.xml
+++ b/src/main/resources/mapper/proofing/ProofingInformationMapper.xml
@@ -51,6 +51,7 @@
                d.is_reject,
                d.node_id,
                d.node_name,
+               dbo.plm_get_user_display(a.site, d.create_by) as nodeCreateBy,
                vpp.bu_no,
                b.bu_desc,
                vpp.final_part_no,
diff --git a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
index 83048e91..0b3d9e15 100644
--- a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
+++ b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
@@ -56,6 +56,7 @@
         <result column="bu_desc" property="buDesc"/>
         <result column="final_part_no" property="finalPartNo"/>
         <result column="customer_part_no" property="customerPartNo"/>
+        <result column="node_create_by" property="nodeCreateBy"/>
     </resultMap>
     <!-- 报价信息列表 -->
     <select id="quotationInformationSearch" resultMap="getQuotation" parameterType="com.spring.modules.quotation.vo.QuotationInformationVo">
@@ -114,6 +115,7 @@
                    d.is_reject,
                    d.node_id,
                    d.node_name,
+                   dbo.plm_get_user_display(d.site,d.create_by) as node_create_by,
                </if>
                vpp.bu_no,
                b.bu_desc,
diff --git a/src/main/resources/mapper/test/TestInformationMapper.xml b/src/main/resources/mapper/test/TestInformationMapper.xml
index badbcb99..fe696641 100644
--- a/src/main/resources/mapper/test/TestInformationMapper.xml
+++ b/src/main/resources/mapper/test/TestInformationMapper.xml
@@ -55,6 +55,7 @@
                d.is_reject,
                d.node_id,
                d.node_name,
+               dbo.plm_get_user_display(a.site, d.create_by)      as node_create_by,
                vpp.bu_no,
                b.bu_desc
         FROM plm_test_information as a
@@ -174,12 +175,18 @@
                pti.print_type,
                pti.product_name,
                pcpi.customer_part_no,
-               vpp.final_part_no
+               vpp.final_part_no,
+               d.node_name,
+               dbo.plm_get_user_display(pti.site, d.create_by)        as node_create_by
         FROM plm_test_information pti
                  left join view_Project_Part vpp on pti.site = vpp.site and pti.test_part_no = vpp.test_part_no and
                                                     pti.project_id = vpp.project_id
                  left join plm_customer_part_info pcpi on pti.site = pcpi.site and pti.test_part_no = pcpi.part_no and
                                                           pti.customer_no = pcpi.customer_no
+                 left join plm_request_header as prh on pti.site = prh.site and prh.menu_id = #{menuId}
+                 left join plm_request_node as d
+                           on pti.site = d.site and prh.classification_no = d.classification_no and
+                              prh.workflow_id = d.workflow_id and pti.step_id = d.step_id
         <where>
             and pti.site = #{site}
             <if test="projectId != null and projectId != ''">