feat(流程设计): 更改人员列表为后端接口获取

ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowDefinitionController.java

@@ -1,14 +1,15 @@
 package com.ruoyi.flowable.controller;
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.flowable.domain.dto.FlowProcDefDto;
 import com.ruoyi.flowable.domain.dto.FlowSaveXmlVo;
 import com.ruoyi.flowable.service.IFlowDefinitionService;
+import com.ruoyi.system.service.ISysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.util.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -21,6 +22,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -40,6 +42,9 @@ public class FlowDefinitionController {
     @Autowired
     private IFlowDefinitionService flowDefinitionService;
 
+    @Autowired
+    private ISysUserService userService;
+
 
     @GetMapping(value = "/list")
     @ApiOperation(value = "流程定义列表", response = FlowProcDefDto.class)
@@ -80,7 +85,7 @@ public class FlowDefinitionController {
     public AjaxResult readXml(@ApiParam(value = "流程定义id") @PathVariable(value = "deployId") String deployId) {
         try {
             return flowDefinitionService.readXml(deployId);
-        }catch (Exception e) {
+        } catch (Exception e) {
             return AjaxResult.error("加载xml文件异常");
         }
 
@@ -98,9 +103,9 @@ public class FlowDefinitionController {
             if (image != null) {
                 ImageIO.write(image, "png", os);
             }
-        }catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
-        }finally {
+        } finally {
             try {
                 if (os != null) {
                     os.flush();
@@ -161,4 +166,11 @@ public class FlowDefinitionController {
         return AjaxResult.success();
     }
 
+    @ApiOperation(value = "指定流程办理人员列表")
+    @GetMapping("/userList")
+    public AjaxResult userList(SysUser user) {
+        List<SysUser> list = userService.selectUserList(user);
+        return AjaxResult.success(list);
+    }
+
 }

ruoyi-ui/src/api/flowable/definition.js

@@ -35,6 +35,15 @@ export function updateState(params) {
   })
 }
 
+// 指定流程办理人员列表
+export function userList(query) {
+  return request({
+    url: '/flowable/definition/userList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 读取xml文件
 export function readXml(deployId) {
   return request({

ruoyi-ui/src/components/Process/components/nodePanel/task.vue

@@ -122,7 +122,7 @@ export default {
             label: '指定人员',
             allowCreate: true,
             filterable: true,
-            dic: { data: _this.users, label: 'name', value: 'id' },
+            dic: { data: _this.users, label: 'nickName', value: 'userId' },
             show: !!_this.showConfig.assignee && _this.formData.userType === 'assignee'
           },
           {
@@ -132,7 +132,7 @@ export default {
             multiple: true,
             allowCreate: true,
             filterable: true,
-            dic: { data: _this.users, label: 'name', value: 'id' },
+            dic: { data: _this.users, label: 'nickName', value: 'userId' },
             show: !!_this.showConfig.candidateUsers && _this.formData.userType === 'candidateUsers'
           },
           {

ruoyi-ui/src/views/flowable/definition/model.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import { readXml, saveXml } from "@/api/flowable/definition";
+import { readXml, saveXml, userList } from "@/api/flowable/definition";
 // import bpmnModeler from "workflow-bpmn-modeler";
 import bpmnModeler from '@/components/Process/index'
 
@@ -26,9 +26,9 @@ export default {
     return {
       xml: "", // 后端查询到的xml
       users: [
-        { name: "张三", id: "1" },
+        // { name: "张三", id: "1" },
-        { name: "李四", id: "2" },
+        // { name: "李四", id: "2" },
-        { name: "轩轩", id: "100" },
+        // { name: "轩轩", id: "100" },
       ],
       groups: [
         { name: "超级管理员", id: "1" },
@@ -43,30 +43,44 @@ export default {
   },
   created () {
     const deployId = this.$route.query && this.$route.query.deployId;
+    //  查询流程xml
     if (deployId) {
       this.getModelDetail(deployId);
     }
+    this.getUserList()
   },
   methods: {
+    /** xml 文件 */
     getModelDetail(deployId) {
       // 发送请求，获取xml
       readXml(deployId).then(res =>{
         this.xml = res.data
       })
     },
+    /** 保存xml */
     save(data) {
       const params = {
         name: data.process.name,
         category: data.process.category,
         xml: data.xml
       }
-      saveXml(params).then(res =>{
+      saveXml(params).then(res => {
         this.$message(res.msg)
         // 关闭当前标签页并返回上个页面
         this.$store.dispatch("tagsView/delView", this.$route);
         this.$router.go(-1)
       })
     },
+    /** 指定流程办理人员列表 */
+    getUserList() {
+      // todo 待根据部门选择人员
+      // const params = {
+      //
+      // }
+      userList().then(res =>{
+        this.users = res.data
+      })
+    },
   },
 };
 </script>