From 52ab58771dcbfe8b5ce65443862f2da5a62b9a8a Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Thu, 7 Nov 2024 12:13:45 +0800
Subject: [PATCH] =?UTF-8?q?2024.11.7=20=E6=96=87=E6=A1=A3=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ojectProductionValidationDocumentData.java |  9 +++++++++
 .../service/Impl/EamProjectServiceImpl.java   |  1 +
 .../resources/mapper/pms/EamProjectMapper.xml | 19 ++++++++++++++-----
 3 files changed, 24 insertions(+), 5 deletions(-)

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 a822c34c..16a5b924 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
@@ -1,5 +1,6 @@
 package com.xujie.sys.modules.pms.data;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xujie.sys.common.utils.QueryPage;
 import lombok.Data;
@@ -24,6 +25,8 @@ public class ProjectProductionValidationDocumentData extends EamProjectPartInfoD
 
     private String OrderRef2;
 
+    private String OrderRef3;
+
     /**
      * sys_oss表中的id
      */
@@ -83,4 +86,10 @@ public class ProjectProductionValidationDocumentData extends EamProjectPartInfoD
     private List<ProjectProductionValidationDocumentData> selectedDocumentItems;
 
     private List<ProjectProductionValidationDocumentData> projectAllDocumentConfirmatorList;
+
+    @TableField(exist = false)
+    private String documentDefinitionListId;
+
+    @TableField(exist = false)
+    private String createdBy;
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java
index a3ddc4e5..8e962b8a 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java
@@ -362,6 +362,7 @@ public class EamProjectServiceImpl implements EamProjectService {
             for (ProjectProductionValidationDocumentData item : selectedDocumentItems) {
                 item.setOrderRef1(String.valueOf(list.get(0).getProjectId()));
                 item.setOrderRef2(String.valueOf(list.get(0).getProjectPartId()));
+                item.setOrderRef3(item.getDocumentDefinitionListId());
                 int maxItemNo = EamProjectMapper.getMaxItemNo2(item);
                 item.setItemNo(maxItemNo + 1);
                 EamProjectMapper.saveProductionValidationDocument(item);
diff --git a/src/main/resources/mapper/pms/EamProjectMapper.xml b/src/main/resources/mapper/pms/EamProjectMapper.xml
index 25cec637..10e75756 100644
--- a/src/main/resources/mapper/pms/EamProjectMapper.xml
+++ b/src/main/resources/mapper/pms/EamProjectMapper.xml
@@ -11,9 +11,9 @@
     </insert>
     <insert id="saveProductionValidationDocument">
         INSERT INTO plm_project_document_confirm_file_list
-        (site,Order_Ref1,Order_Ref2,Item_No,document_type,document_id)
+        (site,Order_Ref1,Order_Ref2,Item_No,document_type,document_id,Order_Ref3)
         VALUES
-        (#{site},#{orderRef1},#{orderRef2},#{itemNo},#{documentType},#{documentId})
+        (#{site},#{orderRef1},#{orderRef2},#{itemNo},#{documentType},#{documentId},#{orderRef3})
     </insert>
     <insert id="saveProductionValidationDocumentConfirmator">
         INSERT INTO plm_project_document_confirm
@@ -244,9 +244,18 @@
     </select>
     <select id="searchConfirmProgressDocumentList"
             resultType="com.xujie.sys.modules.pms.data.ProjectProductionValidationDocumentData">
-        SELECT a.Item_No,a.document_type,b.file_name,a.document_id
-        FROM plm_project_document_confirm_file_list as a
-        LEFT JOIN sys_oss as b ON a.document_id = b.id and a.site = b.order_ref1 and a.Order_Ref1 = b.order_ref4
+        SELECT a.Item_No,
+               a.document_type,
+               (case when a.order_ref3 = '-2' then c.sop_name ELSE b.file_name END) as file_name,
+               a.document_id,
+               a.site,
+               a.Order_Ref1 AS project_id,
+               a.order_ref3 AS document_definition_list_id,
+               b.created_by
+        FROM
+            plm_project_document_confirm_file_list AS a
+                LEFT JOIN sys_oss AS b ON a.document_id = b.id
+                LEFT JOIN part_sop AS c ON a.document_id = c.id
         WHERE a.Site = #{query.site} and a.Order_Ref1 = #{query.orderRef1} and a.Order_Ref2 = #{query.orderRef2}
         ORDER BY a.Item_No
     </select>