From 484c95944d569ca78e568b75be7ab573a0786f45 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 14 Oct 2024 18:17:41 +0800
Subject: [PATCH] 1127

---
 .../data/PlmProjectToolApplyHeaderData.java   |  5 ++++
 .../PlmTechnicalSpecificationSheetData.java   | 20 ++++++++++++++++
 .../Tooling/ProjectToolingApplyMapper.xml     | 24 ++++++++++++-------
 .../TechnicalSpecificationMapper.xml          |  8 ++++++-
 4 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java b/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java
index ca971bfd..7bda7b33 100644
--- a/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java
+++ b/src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java
@@ -30,4 +30,9 @@ public class PlmProjectToolApplyHeaderData extends PlmProjectToolApplyHeader {
     private String tpName;
 
     private String purchaserName;
+    private String isReject;
+    private String nodeId;
+    private String nodeName;
+
+
 }
diff --git a/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java
index cf17f31d..2dad8b9b 100644
--- a/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java
+++ b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java
@@ -59,6 +59,10 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio
      */
     private String rejectOpinion;
 
+
+    private String nodeId;
+    private String nodeName;
+
     public String getRejectOpinion() {
         return rejectOpinion;
     }
@@ -397,4 +401,20 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio
     public void setFinalCustomerId(String finalCustomerId) {
         this.finalCustomerId = finalCustomerId;
     }
+
+    public String getNodeId() {
+        return nodeId;
+    }
+
+    public void setNodeId(String nodeId) {
+        this.nodeId = nodeId;
+    }
+
+    public String getNodeName() {
+        return nodeName;
+    }
+
+    public void setNodeName(String nodeName) {
+        this.nodeName = nodeName;
+    }
 }
diff --git a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
index 8dfb43c1..f3bfd8b1 100644
--- a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
+++ b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
@@ -78,24 +78,30 @@
     </update>
 
     <select id="searchToolApplyHeader" resultType="PlmProjectToolApplyHeaderData">
-        SELECT site,apply_no,apply_by,status_code,status,apply_date,applySumQty,applyReason,remark,create_by,create_date,update_by,
-        update_date,prNo,remark1,poNo,allCost,remark2,supplierName,department,dbo.plm_get_dictDataLabel('tool_application_department',department,site) departmentDesc
-        ,tp,dbo.get_userDisPlay(tp) tpName   ,quoter,dbo.get_userDisPlay(quoter) quoterName   ,purchaser,dbo.get_userDisPlay(purchaser) purchaserName,step_id
-        ,reject_flag    ,reject_step_id,totalCost
-        FROM plm_project_tool_applyHeader
+        SELECT a.site,a.apply_no,a.apply_by,a.status_code,a.status,a.apply_date,a.applySumQty,a.applyReason,a.remark,a.create_by,a.create_date,a.update_by,
+        a.update_date,a.prNo,a.remark1,a.poNo,a.allCost,a.remark2,a.supplierName,a.department,dbo.plm_get_dictDataLabel('tool_application_department',a.department,a.site) departmentDesc
+        ,a.tp,dbo.get_userDisPlay(a.tp) tpName   ,a.quoter,dbo.get_userDisPlay(a.quoter) quoterName   ,a.purchaser,dbo.get_userDisPlay(a.purchaser) purchaserName,a.step_id
+        ,a.reject_flag    ,a.reject_step_id,a.totalCost,
+         d.is_reject,
+               d.node_id,
+               d.node_name
+        FROM plm_project_tool_applyHeader a
+        left join plm_request_header as prh on a.site = prh.site and prh.menu_id = '106002'
+left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and
+                                   prh.workflow_id = d.workflow_id and a.step_id = d.step_id
         <where>
 
             <if test="query.site != null and query.site != ''">
-                AND site = #{query.site}
+                AND a.site = #{query.site}
             </if>
             <if test="query.applyNo != null and query.applyNo != ''">
-                AND apply_no like #{query.applyNo}
+                AND a.apply_no like #{query.applyNo}
             </if>
             <if test="query.startDate != null ">
-                AND apply_date >= #{query.startDate}
+                AND a.apply_date >= #{query.startDate}
             </if>
              <if test="query.endDate != null ">
-                AND  #{query.endDate} >= apply_date
+                AND  #{query.endDate} >= a.apply_date
             </if>
 
 <!--            <if test="query.projectOwnerName != null and query.projectOwnerName != ''">-->
diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
index 264ac9a1..5cfde4aa 100644
--- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
+++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
@@ -16,11 +16,17 @@
         , a.faiOperator,dbo.get_userDisPlay(a.faiOperator) faiOperatorName
             ,a.peOperater,dbo.get_userDisPlay(a.peOperater) peOperaterName
         ,a.csOperater,dbo.get_userDisPlay(a.csOperater) csOperaterName
-        ,a.dccOperater,dbo.get_userDisPlay(a.dccOperater) dccOperaterName
+        ,a.dccOperater,dbo.get_userDisPlay(a.dccOperater) dccOperaterName,
+         d.is_reject,
+               d.node_id,
+               d.node_name
 
         FROM plm_technical_specification_sheet a
         left join view_Project_final_Part b on a.site=b.site and a.project_id=b.project_id and a.test_part_no=b.test_part_no
         left join plm_project_info c on a.site=c.site and a.project_id=c.project_id
+                left join plm_request_header as prh on a.site = prh.site and prh.menu_id = '103002'
+left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and
+                                   prh.workflow_id = d.workflow_id and a.step_id = d.step_id
         <where>
             <if test="query.id != null">
                 AND a.id = #{query.id}