审批获取部门角色

platform-dao/src/main/java/com/platform/dao/dto/workflow/WorkflowNodeDTO.java

@@ -92,7 +92,7 @@ public class WorkflowNodeDTO extends BaseDTO implements Serializable {
      */
     private String keyword;
 
-    private Integer nodeFilterModel; // 节点审批模式 0 全部审批 1 其中一人审批即可
+    private Integer nodeFilterModel; // 审批模式 2 全签 1 会签
 
     private String switchJson; // 分支json
 
@@ -100,4 +100,7 @@ public class WorkflowNodeDTO extends BaseDTO implements Serializable {
 
     private String frontId; // 前端ID
     private String frontParentId; // 前端父级ID
+    private Integer verifyType; //  人员类型 0 审批人 1 审批角色 默认审批人
+    private String roleId; // 审批人角色ID
+    private String deptId; // 角色所属部门ID
 }

platform-dao/src/main/java/com/platform/dao/entity/workflow/WorkflowNode.java

@@ -77,7 +77,7 @@ public class WorkflowNode implements Serializable {
     @Transient
     private DataScope dataScope;
 
-    private Integer nodeFilterModel; // 节点审批模式 0 全部审批 1 其中一人审批即可
+    private Integer nodeFilterModel; // 审批模式 2 全签 1 会签
 
     private String switchJson; // 分支json
 
@@ -86,4 +86,7 @@ public class WorkflowNode implements Serializable {
     private String frontId; // 前端ID
     private String frontParentId; // 前端父级ID
 
+    private Integer verifyType; //  人员类型 0 审批人 1 审批角色 默认审批人
+    private String roleId; // 审批人角色ID
+    private String deptId; // 角色所属部门ID
 }

platform-dao/src/main/java/com/platform/dao/entity/workflow/WorkflowTaskBom.java

@@ -71,47 +71,6 @@ public class WorkflowTaskBom implements Serializable {
 
     private Integer reminderNum; // 催办次数
 
-    /**
-     * 自定义字段1
-     *//*
-    private String cdefine1;
-    *//**
-     * 自定义字段2
-     *//*
-    private String cdefine2;
-    *//**
-     * 自定义字段3
-     *//*
-    private String cdefine3;
-    *//**
-     * 自定义字段4
-     *//*
-    private String cdefine4;
-    *//**
-     * 自定义字段5
-     *//*
-    private String cdefine5;
-    *//**
-     * 自定义字段6
-     *//*
-    private String cdefine6;
-    *//**
-     * 自定义字段7
-     *//*
-    private String cdefine7;
-    *//**
-     * 自定义字段8
-     *//*
-    private String cdefine8;
-    *//**
-     * 自定义字段9
-     *//*
-    private String cdefine9;
-    *//**
-     * 自定义字段10
-     *//*
-    private String cdefine10;*/
-
     /**
      * 数据权限
      */

platform-dao/src/main/java/com/platform/dao/enums/NodeFilterModelEnum.java

@@ -0,0 +1,27 @@
+package com.platform.dao.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Description 审批模式
+ * @Author lsq
+ * @Date 2024/08/05
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
+ */
+@Getter
+@AllArgsConstructor
+public enum NodeFilterModelEnum {
+
+    /**
+     * 全签
+     */
+    FULL(2),
+    /**
+     * 会签
+     */
+    SINGLE(1)
+    ;
+    private final Integer value;
+
+}

platform-dao/src/main/java/com/platform/dao/mapper/upms/SysRoleMapper.java

@@ -6,6 +6,8 @@ import com.platform.dao.entity.upms.SysRole;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @Description 角色 mapper
  * @Author chenli
@@ -15,4 +17,6 @@ import org.springframework.stereotype.Component;
 @Mapper
 @Component
 public interface SysRoleMapper extends MyMapper<SysRole> {
+
+    List<SysRole> selectRoleByDeptId(String id);
 }

platform-dao/src/main/java/com/platform/dao/vo/query/workflow/WorkflowNodeVO.java

@@ -73,7 +73,7 @@ public class WorkflowNodeVO extends BaseVO implements Serializable {
     private String userName;
 
 
-    private Integer nodeFilterModel; // 节点审批模式 0 全部审批 1 其中一人审批即可
+    private Integer nodeFilterModel; // 节点审批模式 2 全签 1 会签
 
     private String switchJson; // 分支json
 
@@ -82,5 +82,7 @@ public class WorkflowNodeVO extends BaseVO implements Serializable {
     private String frontId; // 前端ID
     private String frontParentId; // 前端父级ID
 
-
+    private Integer verifyType; //  人员类型 0 审批人 1 审批角色 默认审批人
+    private String roleId; // 审批人角色ID
+    private String deptId; // 角色所属部门ID single
 }

platform-dao/src/main/resources/mapper/upms/SysRoleMapper.xml

@@ -2,4 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.platform.dao.mapper.upms.SysRoleMapper">
 
+    <select id="selectRoleByDeptId" parameterType="java.lang.String" resultType="com.platform.dao.entity.upms.SysRole">
+        select role.role_name, role.role_id
+        from t_sys_role role
+                 join (select DISTINCT role_id
+                       from t_sys_user_role
+                       where user_id in (select DISTINCT user_id from t_sys_user_dept where dept_id = #{id})) t
+                      on role.role_id = t.role_id
+    </select>
 </mapper>

platform-rest/src/main/java/com/platform/rest/controller/upms/SysRoleController.java

@@ -157,4 +157,10 @@ public class SysRoleController {
         return new R<>(sysRoleService.getRepairRole());
     }
 
+
+    @SysLog("根据部门ID查询角色信息")
+    @GetMapping("/list/role/{deptId}")
+    public R getRoleListByDeptId(@PathVariable("deptId") String deptId) {
+        return new R(sysRoleService.selectRoleByDeptId(deptId));
+    }
 }

platform-service/src/main/java/com/platform/service/upms/SysRoleService.java

@@ -45,4 +45,6 @@ public interface SysRoleService extends IBaseService<SysRole, SysRoleDTO> {
      * @return
      */
     Integer getRepairRole();
+
+    List<SysRole> selectRoleByDeptId(String id);
 }

platform-service/src/main/java/com/platform/service/upms/impl/SysRoleServiceImpl.java

@@ -38,6 +38,7 @@ import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -172,6 +173,11 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleMapper, SysRole,
         return null;
     }
 
+    @Override
+    public List<SysRole> selectRoleByDeptId(String id) {
+        return mapper.selectRoleByDeptId(id);
+    }
+
     @Override
     public AbstractPageResultBean<SysRole> selectPageInfo(SysRoleDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);