feat(workflow): 新增审批人设置功能

- 在工作流启动页面添加审批人设置功能
- 实现指定用户、角色、部门和发起人四种审批类型
- 优化表单提交逻辑，支持审批人信息的传递
- 在后端增加处理审批人信息的逻辑
- 优化流程启动服务，支持设置下一个任务的审批人

klp-admin/src/main/java/com/klp/web/controller/workflow/WfProcessController.java

@@ -201,9 +201,9 @@ public class WfProcessController extends BaseController {
     @SaCheckPermission("workflow:process:start")
     @PostMapping("/start/{processDefId}")
     public R<Void> start(@PathVariable(value = "processDefId") String processDefId, @RequestBody Map<String, Object> variables) {
+        // 如果包含审批人信息，则处理审批人信息
         processService.startProcessByDefId(processDefId, variables);
         return R.ok("流程启动成功");
-
     }
 
     /**

klp-system/src/main/java/com/klp/workflow/service/impl/WfProcessServiceImpl.java

@@ -689,11 +689,77 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
         variables.put(BpmnXMLConstants.ATTRIBUTE_EVENT_START_INITIATOR, userIdStr);
         // 设置流程状态为进行中
         variables.put(ProcessConstants.PROCESS_STATUS_KEY, ProcessStatus.RUNNING.getStatus());
+        
         // 发起流程实例
         ProcessInstance processInstance = runtimeService.startProcessInstanceById(procDef.getId(), variables);
+        
+        // 如果包含审批人信息，则设置下一个任务的审批人
+        try {
+            if (variables.containsKey("flowable") && variables.get("flowable") != null) {
+                Object flowableObj = variables.get("flowable");
+                if (flowableObj instanceof Map) {
+                    @SuppressWarnings("unchecked")
+                    Map<String, Object> flowable = (Map<String, Object>) flowableObj;
+                    if (flowable.containsKey("candidateUsers")) {
+                        Object candidateUsersObj = flowable.get("candidateUsers");
+                        if (candidateUsersObj != null) {
+                            String candidateUsers = candidateUsersObj.toString();
+                            if (StringUtils.isNotBlank(candidateUsers)) {
+                                // 获取流程模型
+                                BpmnModel bpmnModel = repositoryService.getBpmnModel(processInstance.getProcessDefinitionId());
+                                // 设置下一个任务的审批人
+                                this.assignNextUsers(bpmnModel, processInstance.getProcessInstanceId(), candidateUsers);
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            // 记录异常但不影响流程启动
+            e.printStackTrace();
+        }
+        
         // 第一个用户任务为发起人，则自动完成任务
         wfTaskService.startFirstTask(processInstance, variables);
     }
+    
+    /**
+     * 设置下一个任务的审批人
+     *
+     * @param bpmnModel 流程模型
+     * @param processInstanceId 流程实例ID
+     * @param candidateUsers 候选人字符串
+     */
+    private void assignNextUsers(BpmnModel bpmnModel, String processInstanceId, String candidateUsers) {
+        if (StringUtils.isBlank(candidateUsers)) {
+            return;
+        }
+        
+        try {
+            // 获取当前流程实例的所有任务
+            List<Task> tasks = taskService.createTaskQuery()
+                .processInstanceId(processInstanceId)
+                .list();
+            
+            if (CollUtil.isEmpty(tasks)) {
+                return;
+            }
+            
+            // 为每个任务设置候选人
+            for (Task task : tasks) {
+                // 解析候选人字符串，格式可能是：userId1,userId2,userId3
+                String[] userIds = candidateUsers.split(",");
+                for (String userId : userIds) {
+                    if (StringUtils.isNotBlank(userId)) {
+                        // 添加候选人
+                        taskService.addCandidateUser(task.getId(), userId.trim());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
 
     /**

klp-ui/src/views/workflow/work/start.vue

@@ -6,21 +6,108 @@
       </div>
       <el-col :span="18" :offset="3">
         <div class="form-conf" v-if="formOpen">
-          <parser :key="new Date().getTime()" :form-conf="formData" @submit="submit" ref="parser" @getData="getData"/>
+          <parser :key="new Date().getTime()" :form-conf="formData" ref="parser" @getData="getData"/>
+        </div>
+        
+        <!-- 审批负责人设置 -->
+        <el-card class="box-card" shadow="hover" v-if="formOpen">
+          <div slot="header" class="clearfix">
+            <span>审批人设置</span>
+          </div>
+          <el-form ref="approvalForm" :model="approvalForm" label-width="120px">
+            <el-form-item label="审批负责人">
+              <el-radio-group v-model="approvalForm.approvalType">
+                <el-radio :label="1">指定用户</el-radio>
+                <el-radio :label="2">角色</el-radio>
+                <el-radio :label="3">部门</el-radio>
+                <el-radio :label="4">发起人</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            
+            <el-form-item v-if="approvalForm.approvalType === 1">
+              <el-tag
+                :key="index"
+                v-for="(item, index) in approvalUsers"
+                closable
+                :disable-transitions="false"
+                @close="handleClose(item)">
+                {{ item.nickName }}
+              </el-tag>
+              <el-button class="button-new-tag" type="primary" icon="el-icon-plus" size="mini" circle @click="onSelectUsers" />
+            </el-form-item>
+          </el-form>
+        </el-card>
+        
+        <!-- 提交和重置按钮 -->
+        <div class="submit-buttons" v-if="formOpen">
+          <el-button type="primary" @click="submitForm">提交</el-button>
+          <el-button @click="resetForm">重置</el-button>
         </div>
       </el-col>
     </el-card>
+    
+    <!-- 用户选择对话框 -->
+    <el-dialog title="选择审批人" :visible.sync="userData.open" width="60%" append-to-body>
+      <el-row type="flex" :gutter="20">
+        <!--部门数据-->
+        <el-col :span="5">
+          <el-card shadow="never" style="height: 100%">
+            <div slot="header">
+              <span>部门列表</span>
+            </div>
+            <div class="head-container">
+              <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"/>
+              <el-tree
+                :data="deptOptions"
+                :props="deptProps"
+                :expand-on-click-node="false"
+                :filter-node-method="filterNode"
+                ref="tree"
+                default-expand-all
+                @node-click="handleNodeClick"
+              />
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="18">
+          <el-table ref="userTable"
+                    height="500"
+                    v-loading="userLoading"
+                    :data="userList"
+                    highlight-current-row
+                    @selection-change="handleSelectionChange">
+            <el-table-column width="55" type="selection" />
+            <el-table-column label="用户名" align="center" prop="nickName" />
+            <el-table-column label="手机" align="center" prop="phonenumber" />
+            <el-table-column label="部门" align="center" prop="dept.deptName" />
+          </el-table>
+          <pagination
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </el-col>
+      </el-row>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="userData.open = false">取 消</el-button>
+        <el-button type="primary" @click="submitUserData">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { getProcessForm, startProcess } from '@/api/workflow/process'
 import Parser from '@/utils/generator/parser'
+import { selectUser, deptTreeSelect } from '@/api/system/user'
+import Pagination from '@/components/Pagination'
 
 export default {
   name: 'WorkStart',
   components: {
-    Parser
+    Parser,
+    Pagination
   },
   data() {
     return {
@@ -29,6 +116,35 @@ export default {
       procInsId: null,
       formOpen: false,
       formData: {},
+      // 审批表单
+      approvalForm: {
+        approvalType: 1, // 默认指定用户
+      },
+      // 审批用户
+      approvalUsers: [],
+      userMultipleSelection: [],
+      // 部门名称
+      deptName: undefined,
+      // 部门树选项
+      deptOptions: undefined,
+      userLoading: false,
+      // 用户表格数据
+      userList: null,
+      deptProps: {
+        children: "children",
+        label: "label"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        deptId: undefined
+      },
+      total: 0,
+      // 用户数据
+      userData: {
+        open: false
+      }
     }
   },
   created() {
@@ -55,7 +171,7 @@ export default {
       if (data) {
         const variables = [];
         data.fields.forEach(item => {
-          let variableData = {};
+          const variableData = {};
           variableData.label = item.__config__.label
           // 表单值为多个选项时
           if (item.__config__.defaultValue instanceof Array) {
@@ -72,16 +188,155 @@ export default {
         this.variables = variables;
       }
     },
-    submit(data) {
+    // 提交表单
-      if (data && this.definitionId) {
+    submitForm() {
-        // 启动流程并将表单数据加入流程变量
+      const parserRef = this.$refs.parser;
-        startProcess(this.definitionId, JSON.stringify(data.valData)).then(res => {
+      if (!parserRef) {
-          this.$modal.msgSuccess(res.msg);
+        this.$modal.msgError("表单未加载完成");
-          this.$tab.closeOpenPage({
+        return;
-            path: '/work/own'
+      }
+      
+      // 获取表单数据
+      parserRef.getData();
+      
+      // 验证表单
+      parserRef.$refs[parserRef.formConfCopy.formRef].validate(valid => {
+        if (valid) {
+          const formData = parserRef[parserRef.formConfCopy.formModel];
+          
+          // 添加审批人信息到表单数据
+          // 根据审批类型添加不同的审批人信息
+          if (this.approvalForm.approvalType === 1 && this.approvalUsers.length > 0) {
+            // 指定用户
+            formData.flowable = formData.flowable || {};
+            formData.flowable.candidateUsers = this.approvalUsers.map(user => user.userId).join(',');
+            formData.flowable.candidateGroups = '';
+            formData.flowable.text = this.approvalUsers.map(user => user.nickName).join(',');
+          } else if (this.approvalForm.approvalType === 2) {
+            // 角色
+            formData.flowable = formData.flowable || {};
+            formData.flowable.candidateUsers = '';
+            formData.flowable.candidateGroups = 'ROLE_';
+          } else if (this.approvalForm.approvalType === 3) {
+            // 部门
+            formData.flowable = formData.flowable || {};
+            formData.flowable.candidateUsers = '';
+            formData.flowable.candidateGroups = 'DEPT_';
+          } else if (this.approvalForm.approvalType === 4) {
+            // 发起人
+            formData.flowable = formData.flowable || {};
+            formData.flowable.candidateUsers = '';
+            formData.flowable.candidateGroups = '';
+          }
+          
+          // 启动流程并将表单数据加入流程变量
+          if (this.definitionId) {
+            startProcess(this.definitionId, JSON.stringify(formData)).then(res => {
+              this.$modal.msgSuccess(res.msg);
+              this.$tab.closeOpenPage({
+                path: '/work/own'
+              });
+            });
+          } else {
+            this.$modal.msgError("流程定义ID不存在");
+          }
+        } else {
+          this.$modal.msgError("表单验证失败，请检查填写的内容");
+        }
+      });
+    },
+    
+    // 重置表单
+    resetForm() {
+      const parserRef = this.$refs.parser;
+      if (parserRef) {
+        parserRef.$refs[parserRef.formConfCopy.formRef].resetFields();
+      }
+      this.approvalUsers = [];
+      this.userMultipleSelection = [];
+      this.approvalForm.approvalType = 1;
+    },
+    /** 查询部门下拉树结构 */
+    getTreeSelect() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    /** 查询用户列表 */
+    getList() {
+      this.userLoading = true;
+      selectUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.userList = response.rows;
+        this.total = response.total;
+        this.toggleSelection(this.userMultipleSelection);
+        this.userLoading = false;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.deptId = data.id;
+      this.getList();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.userMultipleSelection = selection;
+    },
+    toggleSelection(selection) {
+      if (selection && selection.length > 0) {
+        this.$nextTick(()=> {
+          selection.forEach(item => {
+            let row = this.userList.find(k => k.userId === item.userId);
+            if (row) {
+              this.$refs.userTable.toggleRowSelection(row);
+            }
           })
         })
+      } else {
+        this.$nextTick(() => {
+          this.$refs.userTable.clearSelection();
+        });
       }
+    },
+    // 关闭标签
+    handleClose(tag) {
+      let userObj = this.userMultipleSelection.find(item => item.userId === tag.userId);
+      if (userObj) {
+        this.userMultipleSelection.splice(this.userMultipleSelection.indexOf(userObj), 1);
+      }
+      this.approvalUsers = this.userMultipleSelection;
+    },
+    onSelectUsers() {
+      this.userMultipleSelection = this.approvalUsers;
+      this.userData.open = true;
+      this.getTreeSelect();
+      this.getList();
+    },
+    submitUserData() {
+      if (!this.userMultipleSelection || this.userMultipleSelection.length <= 0) {
+        this.$modal.msgError("请选择用户");
+        return false;
+      }
+      this.approvalUsers = this.userMultipleSelection;
+      this.userData.open = false;
+    },
+    // 添加日期范围
+    addDateRange(params, dateRange, propName) {
+      let search = params;
+      search = typeof(search) === 'object' && search !== null && !Array.isArray(search) ? search : {};
+      dateRange = Array.isArray(dateRange) ? dateRange : [];
+      if (typeof(propName) === 'undefined') {
+        search['beginTime'] = dateRange[0];
+        search['endTime'] = dateRange[1];
+      } else {
+        search['begin' + propName] = dateRange[0];
+        search['end' + propName] = dateRange[1];
+      }
+      return search;
     }
   }
 }