审批配置-获取节点1

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

@@ -54,4 +54,11 @@ public class ApprovalConfigurationController extends BaseController {
 
         return AjaxResult.success(approvalConfigurationService.updateApprovalConfigurationMain(mainVo));
     }
+
+    //根据id删除
+    @DeleteMapping ("/delMain/{id}")
+    public AjaxResult delMain(@PathVariable Integer id){
+
+        return AjaxResult.success(approvalConfigurationService.delMain(id));
+    }
 }

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

@@ -27,9 +27,16 @@ public interface ApprovalConfigurationMapper {
     //根据id获取详情-子表
     List<ApprovalConfigurationRelevanceVo>  getChildById(Integer id);
 
+
+    //根据id删除-主表
+    int delMain(Integer id);
+
     //根据id修改-主表
     int updateMain(ApprovalConfigurationMainVo mainVo);
 
     //根据id删除子表
     int deleteChildById(Integer apid);
+
+    //根据id获取审批节点数组 todo 返回数据待整理，sql已完整写好
+    List<ApprovalConfigurationRelevanceVo> getNodeList(Integer id);
 }

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

@@ -16,4 +16,6 @@ public interface IApprovalConfigurationService {
     ApprovalConfigurationMainVo  getMainDetailById(Integer id);
 
     int updateApprovalConfigurationMain(ApprovalConfigurationMainVo mainVo);
+
+    int delMain(Integer id);
 }

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

@@ -88,4 +88,14 @@ public class IApprovalConfigurationServiceImpl implements IApprovalConfiguration
         }
         return i;
     }
+
+    @Override
+    @Transactional
+    public int delMain(Integer id) {
+        //先删除主表
+        int i = configurationMapper.delMain(id);
+        //再删除子表
+        int i1 = configurationMapper.deleteChildById(id);
+        return i1;
+    }
 }

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

@@ -39,6 +39,9 @@
     <delete id="deleteChildById">
         delete from approval_process_relevance where apid = #{apid}
     </delete>
+    <delete id="delMain">
+        delete from approval_process where id = #{id}
+    </delete>
 
 
     <select id="getALLList" resultMap="listDTO" parameterType="com.ruoyi.domain.dto.ApprovalConfigurationDTO">
@@ -59,4 +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
+            p.approval_name,
+            r.node_id,
+            CASE
+
+                WHEN r.role_id = 0 THEN
+                    '本人' ELSE role.role_name
+                END AS role_name
+        FROM
+            approval_process_relevance r -- 左连接 sys_role 表，连接条件是 role.role_id = r.role_id
+                LEFT JOIN sys_role role ON role.role_id = r.role_id
+                left join approval_process p on p.id = r.apid
+        WHERE
+            r.apid = #{id}
+    </select>
 </mapper>
\ No newline at end of file