From 6cfec4ef7f1afac999aa3127470218cbc306b62d Mon Sep 17 00:00:00 2001 From: zhuyong <123@163.com> Date: Sun, 11 Apr 2021 21:53:47 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1):=20?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8=E4=B8=BA?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FlowDefinitionController.java | 20 ++++++++++++---- ruoyi-ui/src/api/flowable/definition.js | 9 +++++++ .../Process/components/nodePanel/task.vue | 4 ++-- .../src/views/flowable/definition/model.vue | 24 +++++++++++++++---- 4 files changed, 46 insertions(+), 11 deletions(-) diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowDefinitionController.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowDefinitionController.java index e07658d..3f14e3c 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowDefinitionController.java +++ b/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 list = userService.selectUserList(user); + return AjaxResult.success(list); + } + } \ No newline at end of file diff --git a/ruoyi-ui/src/api/flowable/definition.js b/ruoyi-ui/src/api/flowable/definition.js index de54104..bfad61c 100644 --- a/ruoyi-ui/src/api/flowable/definition.js +++ b/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({ diff --git a/ruoyi-ui/src/components/Process/components/nodePanel/task.vue b/ruoyi-ui/src/components/Process/components/nodePanel/task.vue index 096bc0a..dcf6dc5 100644 --- a/ruoyi-ui/src/components/Process/components/nodePanel/task.vue +++ b/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' }, { diff --git a/ruoyi-ui/src/views/flowable/definition/model.vue b/ruoyi-ui/src/views/flowable/definition/model.vue index cecc6a0..9f33e8f 100644 --- a/ruoyi-ui/src/views/flowable/definition/model.vue +++ b/ruoyi-ui/src/views/flowable/definition/model.vue @@ -13,7 +13,7 @@