审批配置-详情

ruoyi-psa/src/main/java/com/ruoyi/controller/ApprovalConfigurationController.java

@@ -61,4 +61,12 @@ public class ApprovalConfigurationController extends BaseController {
 
         return AjaxResult.success(approvalConfigurationService.delMain(id));
     }
+
+    //根据父id获取节点列表
+    @Anonymous
+    @GetMapping ("/getNodeList/{id}")
+    public AjaxResult getNodeList(@PathVariable Integer id){
+
+        return AjaxResult.success(approvalConfigurationService.getNodeList(id));
+    }
 }

ruoyi-psa/src/main/java/com/ruoyi/domain/dto/ApprovalConfigurationNodeDTO.java

+package com.ruoyi.domain.dto;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ApprovalConfigurationNodeDTO {
+    private String approvalName;
+    private String approveType;
+    private String remark;
+    List<ApprovalConfigurationNodeItemDTO> nodeList;
+}

ruoyi-psa/src/main/java/com/ruoyi/domain/dto/ApprovalConfigurationNodeItemDTO.java

+package com.ruoyi.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+
+@Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ApprovalConfigurationNodeItemDTO {
+    private String approvalName;
+    private String approveType;
+    private String remark;
+    private Integer nodeId;
+    private Integer roleId;
+    private String roleName;
+}

ruoyi-psa/src/main/java/com/ruoyi/mapper/ApprovalConfigurationMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.mapper;
 
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.domain.dto.ApprovalConfigurationDTO;
+import com.ruoyi.domain.dto.ApprovalConfigurationNodeItemDTO;
 import com.ruoyi.domain.vo.ApprovalConfigurationMainVo;
 import com.ruoyi.domain.vo.ApprovalConfigurationRelevanceVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -37,6 +38,6 @@ public interface ApprovalConfigurationMapper {
     //根据id删除子表
     int deleteChildById(Integer apid);
 
-    //根据id获取审批节点数组 todo 返回数据待整理，sql已完整写好
-    List<ApprovalConfigurationRelevanceVo> getNodeList(Integer id);
+    //根据id获取审批节点数组
+    List<ApprovalConfigurationNodeItemDTO> getNodeList(Integer id);
 }

ruoyi-psa/src/main/java/com/ruoyi/service/IApprovalConfigurationService.java

@@ -2,6 +2,7 @@ package com.ruoyi.service;
 
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.domain.dto.ApprovalConfigurationDTO;
+import com.ruoyi.domain.dto.ApprovalConfigurationNodeDTO;
 import com.ruoyi.domain.vo.ApprovalConfigurationMainVo;
 
 import java.util.List;
@@ -18,4 +19,6 @@ public interface IApprovalConfigurationService {
     int updateApprovalConfigurationMain(ApprovalConfigurationMainVo mainVo);
 
     int delMain(Integer id);
+
+    ApprovalConfigurationNodeDTO getNodeList(Integer id);
 }

ruoyi-psa/src/main/java/com/ruoyi/service/impl/IApprovalConfigurationServiceImpl.java

@@ -4,6 +4,8 @@ import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.domain.dto.ApprovalConfigurationDTO;
+import com.ruoyi.domain.dto.ApprovalConfigurationNodeDTO;
+import com.ruoyi.domain.dto.ApprovalConfigurationNodeItemDTO;
 import com.ruoyi.domain.vo.ApprovalConfigurationMainVo;
 import com.ruoyi.domain.vo.ApprovalConfigurationRelevanceVo;
 import com.ruoyi.mapper.ApprovalConfigurationMapper;
@@ -13,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -98,4 +101,24 @@ public class IApprovalConfigurationServiceImpl implements IApprovalConfiguration
         int i1 = configurationMapper.deleteChildById(id);
         return i1;
     }
+
+    @Override
+    public ApprovalConfigurationNodeDTO getNodeList(Integer id) {
+        List<ApprovalConfigurationNodeItemDTO> nodeList = configurationMapper.getNodeList(id);
+        ApprovalConfigurationNodeDTO nodeDTO = new ApprovalConfigurationNodeDTO();
+        List<ApprovalConfigurationNodeItemDTO> itemDTOS = new ArrayList<ApprovalConfigurationNodeItemDTO>();
+        for(ApprovalConfigurationNodeItemDTO item : nodeList){
+            ApprovalConfigurationNodeItemDTO itemDTO = new ApprovalConfigurationNodeItemDTO();
+            itemDTO.setNodeId(item.getNodeId());
+            itemDTO.setRoleId(item.getRoleId());
+            itemDTO.setRoleName(item.getRoleName());
+            itemDTOS.add(itemDTO);
+        }
+
+        nodeDTO.setNodeList(itemDTOS);
+        nodeDTO.setApprovalName(nodeList.get(0).getApprovalName());
+        nodeDTO.setApproveType(nodeList.get(0).getApproveType());
+        nodeDTO.setRemark(nodeList.get(0).getRemark());
+        return nodeDTO;
+    }
 }

ruoyi-psa/src/main/resources/mapper/ApprovalConfiguration/ApprovalConfigurationMapper.xml

@@ -62,17 +62,20 @@
     <select id="getChildById" resultType="com.ruoyi.domain.vo.ApprovalConfigurationRelevanceVo">
         select r.node_id as nodeId,r.role_id as roleId,r.apid from approval_process_relevance r where r.apid = #{id}
     </select>
-    <select id="getNodeList" resultType="com.ruoyi.domain.vo.ApprovalConfigurationRelevanceVo">
+    <select id="getNodeList" resultType="com.ruoyi.domain.dto.ApprovalConfigurationNodeItemDTO">
         SELECT
-            p.approval_name,
-            r.node_id,
+            p.approval_name as approvalName,
+            p.approve_type as approveType,
+            role.role_id as roleId,
+            p.remark,
+            r.node_id as nodeId,
             CASE
 
                 WHEN r.role_id = 0 THEN
                     '本人' ELSE role.role_name
-                END AS role_name
+                END AS roleName
         FROM
-            approval_process_relevance r -- 左连接 sys_role 表，连接条件是 role.role_id = r.role_id
+            approval_process_relevance r
                 LEFT JOIN sys_role role ON role.role_id = r.role_id
                 left join approval_process p on p.id = r.apid
         WHERE