BPM 模型重构 7：增加任务分配规则的列表 UI 界面（增加部门的规则配置)

YunaiV
1 parent fe651b42
Showing 5 changed files with 97 additions and 4 deletions
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/impl/BpmTaskAssignRuleServiceImpl.java
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/dept/SysDeptService.java
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/dept/impl/SysDeptServiceImpl.java
yudao-admin-ui/src/views/bpm/model/index.vue
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/object/ObjectUtils.java
@@ -12,8 +12,10 @@ import cn.iocoder.yudao.adminserver.modules.bpm.enums.definition.BpmTaskAssignRu
 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmModelService;
 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmProcessDefinitionService;
 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmTaskAssignRuleService;
+import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService;
 import cn.iocoder.yudao.adminserver.modules.system.service.permission.SysRoleService;
 import cn.iocoder.yudao.framework.activiti.core.util.ActivitiUtils;
+import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.bpmn.model.BpmnModel;
 import org.activiti.bpmn.model.UserTask;
@@ -51,6 +53,8 @@ public class BpmTaskAssignRuleServiceImpl implements BpmTaskAssignRuleService {
     private BpmProcessDefinitionService processDefinitionService;
     @Resource
     private SysRoleService roleService;
+    @Resource
+    private SysDeptService deptService;
     @Override
     public List<BpmTaskAssignRuleDO> getTaskAssignRuleListByProcessDefinitionId(String processDefinitionId,
@@ -141,7 +145,9 @@ public class BpmTaskAssignRuleServiceImpl implements BpmTaskAssignRuleService {
     private void validTaskAssignRuleOptions(Integer type, Set<Long> options) {
         if (Objects.equals(type, BpmTaskAssignRuleTypeEnum.ROLE.getType())) {
             roleService.validRoles(options);
-            return;
+        } else if (ObjectUtils.equalsAny(BpmTaskAssignRuleTypeEnum.DEPT.getType(),
+                BpmTaskAssignRuleTypeEnum.DEPT_LEADER.getType())) {
+            deptService.validDepts(options);
         }
         // TODO 其它的
     }
@@ -93,4 +93,13 @@ public interface SysDeptService {
      */
     List<SysDeptDO> getDeptsByParentIdFromCache(Long parentId, boolean recursive);
+    /**
+     * 校验部门们是否有效。如下情况，视为无效：
+     * 1. 部门编号不存在
+     * 2. 部门被禁用
+     *
+     * @param ids 角色编号数组
+     */
+    void validDepts(Collection<Long> ids);
+
 }
 package cn.iocoder.yudao.adminserver.modules.system.service.dept.impl;
 import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysRoleDO;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptCreateReqVO;
 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptListReqVO;
@@ -26,6 +28,7 @@ import javax.annotation.Resource;
 import java.util.*;
 import static cn.iocoder.yudao.adminserver.modules.system.enums.SysErrorCodeConstants.*;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 /**
  * 部门 Service 实现类
@@ -180,6 +183,26 @@ public class SysDeptServiceImpl implements SysDeptService {
         return result;
     }
+    @Override
+    public void validDepts(Collection<Long> ids) {
+        if (CollUtil.isEmpty(ids)) {
+            return;
+        }
+        // 获得科室信息
+        List<SysDeptDO> depts = deptMapper.selectBatchIds(ids);
+        Map<Long, SysDeptDO> deptMap = CollectionUtils.convertMap(depts, SysDeptDO::getId);
+        // 校验
+        ids.forEach(id -> {
+            SysDeptDO dept = deptMap.get(id);
+            if (dept == null) {
+                throw exception(DEPT_NOT_FOUND);
+            }
+            if (!CommonStatusEnum.ENABLE.getStatus().equals(dept.getStatus())) {
+                throw exception(DEPT_NOT_ENABLE, dept.getName());
+            }
+        });
+    }
+
     /**
      * 递归获取所有的子部门，添加到 result 结果
      *
@@ -245,6 +245,10 @@
             <el-option v-for="item in taskAssignRule.roleOptions" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
           </el-select>
         </el-form-item>
+        <el-form-item v-if="taskAssignRule.form.type === 20 || taskAssignRule.form.type === 21" label="指定部门" prop="deptIds">
+          <treeselect v-model="taskAssignRule.form.deptIds" :options="taskAssignRule.deptTreeOptions" multiple flat :defaultExpandLevel="3"
+                      placeholder="请选择指定部门" :normalizer="normalizer"/>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitAssignRuleForm">确 定</el-button>
@@ -271,11 +275,16 @@ import Parser from &#39;@/components/parser/Parser&#39;
 import {getBaseHeader} from "@/utils/request";
 import {createTaskAssignRule, getTaskAssignRuleList, updateTaskAssignRule} from "@/api/bpm/taskAssignRule";
 import {listSimpleRoles} from "@/api/system/role";
+import {listSimpleDepts} from "@/api/system/dept";
+
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "model",
   components: {
-    Parser
+    Parser,
+    Treeselect
   },
   data() {
     return {
@@ -331,9 +340,12 @@ export default {
         rules: { // 表单校验规则
           type: [{ required: true, message: "规则类型不能为空", trigger: "change" }],
           roleIds: [{required: true, message: "指定角色不能为空", trigger: "change" }],
+          deptIds: [{required: true, message: "指定部门不能为空", trigger: "change" }],
         },
         // 各种下拉框
         roleOptions: [],
+        deptOptions: [],
+        deptTreeOptions: [],
       },
       // 流程导入参数
@@ -460,9 +472,18 @@ export default {
         }
         // 创建
         createModel(this.form).then(response => {
-          this.msgSuccess("新建流程成功");
           this.open = false;
           this.getList();
+          this.$alert('<strong>新建模型成功！</strong>后续需要执行如下 4 个步骤：' +
+            '<div>1. 点击【修改流程】按钮，配置流程的分类、表单信息</div>' +
+            '<div>2. 点击【设计流程】按钮，绘制流程图</div>' +
+            '<div>3. 点击【分配规则】按钮，设置每个用户任务的审批人</div>' +
+            '<div>4. 点击【发布流程】按钮，完成流程的最终发布</div>' +
+            '另外，每次流程修改后，都需要点击【发布流程】按钮，才能正式生效！！！',
+            '重要提示', {
+              dangerouslyUseHTMLString: true,
+              type: 'success'
+            });
         });
       });
     },
@@ -597,9 +618,16 @@ export default {
       // 获得角色列表
       this.taskAssignRule.roleOptions = [];
       listSimpleRoles().then(response => {
-        // 处理 roleOptions 参数
         this.taskAssignRule.roleOptions.push(...response.data);
       });
+      // 获得部门列表
+      this.taskAssignRule.deptOptions = [];
+      this.taskAssignRule.deptTreeOptions = [];
+      listSimpleDepts().then(response => {
+        // 处理 roleOptions 参数
+        this.taskAssignRule.deptOptions.push(...response.data);
+        this.taskAssignRule.deptTreeOptions.push(...this.handleTree(response.data, "id"));
+      });
     },
     /** 处理修改任务分配规则的按钮操作 */
     handleUpdateTaskAssignRule(row) {
@@ -610,10 +638,13 @@ export default {
         ...row,
         options: [],
         roleIds: [],
+        deptIds: [],
       };
       // 将 options 赋值到对应的 roleIds 等选项
       if (row.type === 10) {
         this.taskAssignRule.form.roleIds.push(...row.options);
+      } else if (row.type === 20 || row.type === 21) {
+        this.taskAssignRule.form.deptIds.push(...row.options);
       }
       this.taskAssignRule.open = true;
     },
@@ -629,8 +660,11 @@ export default {
           // 将 roleIds 等选项赋值到 options 中
           if (form.type === 10) {
             form.options = form.roleIds;
+          } else if (form.type === 20 || form.type === 21) {
+            form.options = form.deptIds;
           }
           form.roleIds = undefined;
+          form.deptIds = undefined;
           // 新增
           if (!form.id) {
             form.modelId = this.taskAssignRule.row.id // 模型编号
@@ -668,8 +702,22 @@ export default {
             return roleOption.name;
           }
         }
+      } else if (type === 20 || type === 21) {
+        for (const deptOption of this.taskAssignRule.deptOptions) {
+          if (deptOption.id === option) {
+            return deptOption.name;
+          }
+        }
       }
       return '未知(' + option + ')';
+    },
+    // 格式化部门的下拉框
+    normalizer(node) {
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children
+      }
     }
   }
 };
 package cn.iocoder.yudao.framework.common.util.object;
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ReflectUtil;
 import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.Objects;
 import java.util.function.Consumer;
 /**
@@ -53,4 +56,8 @@ public class ObjectUtils {
         return null;
     }
+    public static <T> boolean equalsAny(T obj, T... array) {
+        return Arrays.asList(array).contains(obj);
+    }
+
 }