From a00721e2cdf71e347fa74c524340e4d08fe8ff53 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 15 Nov 2024 13:09:41 +0800
Subject: [PATCH] 2024-11-15

---
 .../mapper/change/ChangeManagementMapper.xml  | 59 ++++++++++++-------
 1 file changed, 38 insertions(+), 21 deletions(-)

diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml
index 072c5073..2e1d89a4 100644
--- a/src/main/resources/mapper/change/ChangeManagementMapper.xml
+++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml
@@ -1064,28 +1064,45 @@
 
     <select id="getApprovalList" parameterType="com.spring.modules.change.vo.ProcessFormVo" resultType="com.spring.modules.change.vo.ProcessFormVo">
         select
-            a.classification_no,
-            b.node_id,
-            b.node_name,
-            c.reject_flag,
-            case when c.reject_flag = 'Y' then '是' else '否' end as rejectFlagDesc,
-            c.reject_node_id,
-            dbo.plm_get_nodeName(a.site, c.reject_node_id, a.classification_no) as rejectNodeName,
-            c.node_conclusion,
-            case when c.node_conclusion = 'Y' then '同意' when c.node_conclusion = 'N' then '驳回' else '' end as nodeConclusionDesc,
-            c.create_date,
-            c.create_by,
-            c.reject_opinion,
-            c.update_date,
-            case when c.update_by is null then d.username else c.update_by end as updateBy
-        from plm_request_header a
-        LEFT JOIN plm_request_node b ON a.SITE = b.SITE AND a.classification_no = b.classification_no AND a.workflow_id = b.workflow_id
-        LEFT JOIN plm_process_form c ON b.SITE = b.SITE AND b.classification_no = c.classification_no AND b.workflow_id = c.workflow_id AND b.node_id = c.node_id and c.document_no = #{documentNo}
-        left join sys_user as d on c.domain_control_account = d.domain_control_account
-        WHERE a.site = #{site} AND a.menu_id = #{menuId} and c.create_date is not null
+            classification_no,
+            node_id,
+            node_name,
+            reject_flag,
+            rejectFlagDesc,
+            reject_node_id,
+            rejectNodeName,
+            node_conclusion,
+            nodeConclusionDesc,
+            update_date,
+            create_by,
+            reject_opinion,
+            updateBy
+        from (select
+                  distinct
+                  a.classification_no,
+                  b.node_id,
+                  b.node_name,
+                  c.reject_flag,
+                  case when c.reject_flag = 'Y' then '是' else '否' end as rejectFlagDesc,
+                  c.reject_node_id,
+                  dbo.plm_get_nodeName(a.site, c.reject_node_id, a.classification_no) as rejectNodeName,
+                  c.node_conclusion,
+                  case when c.node_conclusion = 'Y' then '同意' when c.node_conclusion = 'N' then '驳回' else '' end as nodeConclusionDesc,
+                  CAST(c.update_date AS DATETIME2(0)) AS update_date,
+                  c.create_by,
+                  CAST(c.create_date AS DATETIME2(0)) AS create_date,
+                  c.reject_opinion,
+                  case when c.update_by is null then d.username else c.update_by end as updateBy
+              from plm_request_header a
+                       LEFT JOIN plm_request_node b ON a.SITE = b.SITE AND a.classification_no = b.classification_no AND a.workflow_id = b.workflow_id
+                       LEFT JOIN plm_process_form c ON b.SITE = b.SITE AND b.classification_no = c.classification_no AND b.workflow_id = c.workflow_id AND b.node_id = c.node_id and c.document_no = #{documentNo}
+                       left join sys_user as d on c.domain_control_account = d.domain_control_account
+              WHERE a.site = #{site} AND a.menu_id = #{menuId} and c.create_date is not null
+              group by a.site, a.classification_no, b.node_id, b.node_name, c.reject_flag, c.reject_node_id, c.node_conclusion, c.node_conclusion, c.update_by, c.create_date, CAST(c.update_date AS DATETIME2(0)), c.create_by, c.reject_opinion, c.update_date, d.username
+             ) t
         ORDER BY
-            CASE WHEN c.create_date IS NULL THEN 1 ELSE 0 END ASC,
-            c.create_date ASC
+            CASE WHEN create_date IS NULL THEN 1 ELSE 0 END ASC,
+            create_date ASC
     </select>
 
     <select id="getTechnicalSpecification" resultType="PlmTechnicalSpecificationSheetData">