From f19836dab95c9057d9f5ad96c08affd134e0246f Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 13 Sep 2024 17:45:03 +0800
Subject: [PATCH] =?UTF-8?q?2024-09-13=20R=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChangeManagementController.java           | 12 +++++++++++
 .../change/mapper/ChangeManagementMapper.java |  2 ++
 .../service/ChangeManagementService.java      |  2 ++
 .../impl/ChangeManagementServiceImpl.java     | 11 ++++++++++
 .../modules/change/vo/ProcessFormVo.java      | 18 ++++++++++++++++
 .../mapper/change/ChangeManagementMapper.xml  | 21 +++++++++++++++++++
 .../resources/mapper/project/ProjectDao.xml   |  3 ++-
 7 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/spring/modules/change/vo/ProcessFormVo.java

diff --git a/src/main/java/com/spring/modules/change/controller/ChangeManagementController.java b/src/main/java/com/spring/modules/change/controller/ChangeManagementController.java
index af5fd6e1..90b576ef 100644
--- a/src/main/java/com/spring/modules/change/controller/ChangeManagementController.java
+++ b/src/main/java/com/spring/modules/change/controller/ChangeManagementController.java
@@ -365,4 +365,16 @@ public class ChangeManagementController {
         return R.ok().put("rows", map);
     }
 
+    /**
+     * 查询审批信息
+     * @param data
+     * @return
+     */
+    @PostMapping(value="/getApprovalList")
+    @ResponseBody
+    public R getApprovalList(@RequestBody ProcessFormVo data) {
+        List<ProcessFormVo> list = changeManagementService.getApprovalList(data);
+        return R.ok().put("rows", list);
+    }
+
 }
diff --git a/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java b/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java
index d13768d8..115bda86 100644
--- a/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java
+++ b/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java
@@ -153,4 +153,6 @@ public interface ChangeManagementMapper extends BaseMapper<ChangeRequestEntity>{
     void chooseItemCSDel(@Param("site") String site, @Param("changeNo") String changeNo);
 
     void updateProcessNode(@Param("site") String site, @Param("bu") String bu, @Param("requestId") String requestId, @Param("classificationNo") String classificationNo, @Param("nodeId") String nodeId, @Param("nodeConclusion") String nodeConclusion, @Param("rejectOpinion") String rejectOpinion);
+
+    List<ProcessFormVo> getApprovalList(ProcessFormVo data);
 }
diff --git a/src/main/java/com/spring/modules/change/service/ChangeManagementService.java b/src/main/java/com/spring/modules/change/service/ChangeManagementService.java
index 6bcfa56e..ad20b3d8 100644
--- a/src/main/java/com/spring/modules/change/service/ChangeManagementService.java
+++ b/src/main/java/com/spring/modules/change/service/ChangeManagementService.java
@@ -68,4 +68,6 @@ public interface ChangeManagementService {
     void submitChange(ChangeRequestVo data);
 
     Map<String, List<RequestNodeAuthorityEntity>> getNodeAuthority(ChangeRequestVo data);
+
+    List<ProcessFormVo> getApprovalList(ProcessFormVo data);
 }
diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
index dd007b0b..715e4067 100644
--- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
+++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
@@ -1874,6 +1874,17 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
         }).collect(Collectors.groupingBy(RequestNodeAuthorityEntity::getTableId));
     }
 
+    /**
+     * 查询审批信息
+     * @param data
+     * @return
+     */
+    @Override
+    public List<ProcessFormVo> getApprovalList(ProcessFormVo data) {
+        List<ProcessFormVo> list = changeManagementMapper.getApprovalList(data);
+        return list;
+    }
+
 
     /**
      * 变更申请新增校验参数
diff --git a/src/main/java/com/spring/modules/change/vo/ProcessFormVo.java b/src/main/java/com/spring/modules/change/vo/ProcessFormVo.java
new file mode 100644
index 00000000..3700b6a6
--- /dev/null
+++ b/src/main/java/com/spring/modules/change/vo/ProcessFormVo.java
@@ -0,0 +1,18 @@
+package com.spring.modules.change.vo;
+
+import com.spring.modules.change.entity.ProcessFormEntity;
+import lombok.Data;
+
+@Data
+public class ProcessFormVo extends ProcessFormEntity {
+
+    private String classificationName;
+
+    private String nodeName;
+
+    private String rejectFlagDesc;
+
+    private String rejectNodeName;
+
+    private String nodeConclusionDesc;
+}
diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml
index 06fcb7aa..07c49374 100644
--- a/src/main/resources/mapper/change/ChangeManagementMapper.xml
+++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml
@@ -996,4 +996,25 @@
             reject_opinion = #{rejectOpinion}
         where site = #{site} and bu = #{bu} and request_id = #{requestId} and classification_no = #{classificationNo} and node_id = #{nodeId}
     </update>
+
+    <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
+        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}
+        WHERE a.site = #{site} AND a.menu_id = #{menuId}
+        ORDER BY b.step_id ASC
+    </select>
 </mapper>
diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml
index 62ce0d7e..35e32086 100644
--- a/src/main/resources/mapper/project/ProjectDao.xml
+++ b/src/main/resources/mapper/project/ProjectDao.xml
@@ -251,13 +251,14 @@
 <delete id="deleteProjectPart">
     delete from plm_project_part where  site=#{site} and project_id=#{projectId}
 </delete>
+
 <select id="getProjectInfoPartList" resultType="PlmProjectPartData">
     select
     a.id,
     a.site,
     a.project_id,
     a.test_part_no,
-    b.family_id as part_type,
+    b.family_id as partType,
     b.part_desc,
     dbo.get_family_name(b.site, b.family_id) as partTypeDesc,
     b.code_no,