diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeign.java index 9cb44acc06..5eedcd6179 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeign.java @@ -121,11 +121,11 @@ public interface BaseOutsourcingApplicationFeign { @ApiOperation(value = "获取下一个环节") @PostMapping(value = "/getNextNodesForSubmit") - ResultBean getNextNodesForSubmit(@ApiParam(value = "变量集合,json对象") @RequestBody GetNextNodeDto gnnd); + ResultBean getNextNodesForSubmit(@ApiParam(value = "变量集合,json对象") @RequestBody BaseOutsourcingApplicationDto dto); @ApiOperation(value = "获取上一个环节") @PostMapping(value = "/getPreviousNodesForReject") - ResultBean getPreviousNodesForReject(@ApiParam(value = "变量集合,json对象") @RequestBody GetNextNodeDto gnnd); + ResultBean getPreviousNodesForReject(@ApiParam(value = "变量集合,json对象") @RequestBody BaseOutsourcingApplicationDto dto); @ApiOperation(value = "撤回流程") @PostMapping(value = "/revokeProcess") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeignFallback.java index c16ca2f7d4..623acf4e96 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeignFallback.java @@ -138,12 +138,12 @@ public class BaseOutsourcingApplicationFeignFallback implements BaseOutsourcingA } @Override - public ResultBean getNextNodesForSubmit(GetNextNodeDto gnnd) { + public ResultBean getNextNodesForSubmit(BaseOutsourcingApplicationDto dto) { return null; } @Override - public ResultBean getPreviousNodesForReject(GetNextNodeDto gnnd) { + public ResultBean getPreviousNodesForReject(BaseOutsourcingApplicationDto dto) { return null; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationRest.java index 375faf9a84..42b268f97e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationRest.java @@ -140,6 +140,7 @@ public class BaseOutsourcingApplicationRest implements BaseOutsourcingApplicatio bv.setComment(bvd.getComment()); bv.setBusinessSid(bvd.getBusinessSid());*/ bv.setModelId(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId()); + bv.setFormVariables(BeanUtil.beanToMap(bvd)); return baseOutsourcingApplicationService.complete(bv); } @@ -174,12 +175,13 @@ public class BaseOutsourcingApplicationRest implements BaseOutsourcingApplicatio } @Override - public ResultBean getNextNodesForSubmit(GetNextNodeDto gnnd) { - return baseOutsourcingApplicationService.getNextNodesForSubmit(gnnd); + public ResultBean getNextNodesForSubmit(BaseOutsourcingApplicationDto dto) { + return baseOutsourcingApplicationService.getNextNodesForSubmit(dto); } @Override - public ResultBean getPreviousNodesForReject(GetNextNodeDto gnnd) { - return baseOutsourcingApplicationService.getPreviousNodesForReject(gnnd); + public ResultBean getPreviousNodesForReject(BaseOutsourcingApplicationDto dto) { + + return baseOutsourcingApplicationService.getPreviousNodesForReject(dto); } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java index e4f843c7c1..9283bd0615 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java @@ -545,22 +545,22 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService handleProsess(BusinessVariables dto) { UpdateFlowFieldVo vo = new UpdateFlowFieldVo(); @@ -258,7 +260,9 @@ public class FlowableRest implements FlowableFeign { } else { taskService.addComment(taskId, instanceId, FlowComment.NORMAL.getType(), comment); - //taskService.setAssignee(taskId, userSid); + log.error("taskid:{},userSid:{}",taskId, userSid); + log.error("formVariables:{}",JSON.toJSONString(formVariables)); + taskService.setAssignee(taskId, userSid); //formVariables.remove("userSid"); taskService.complete(taskId, formVariables); diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index dce3efe289..688f9800b1 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -724,8 +724,15 @@ public class FlowTaskService extends MybatisBaseService assignee_ = sysUserFeign.selectUserInfoByUserSid(histTask.get("ASSIGNEE_").toString()); - flowTask.setAssigneeName(assignee_.getData().getStaffName()); + ResultBean> assignee_ = sysUserFeign.fetchBySids(histTask.get("ASSIGNEE_").toString()); + StringBuilder userName=new StringBuilder(); + List data1 = assignee_.getData(); + for( SysUserVo data:data1){ + userName.append(data.getName()).append(","); + } + String userName_str=""; + userName_str=userName.substring(0,userName.length()-1); + flowTask.setAssigneeName(userName_str); } flowTask.setHasRevokeButton(userSid.equals(flowTask.getAssigneeSid()) ? true : false); diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue index 78e1c78c97..e089e3f99b 100644 --- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue @@ -6,6 +6,7 @@
外采申请表详情
+ {{formobj.userSid}} 同 意 驳 回 终 止 @@ -247,25 +248,6 @@ export default { this.nodeDialogVisible = false this.nodeDialogVisibleForReject=false }, - //根据环节上配置的角色查询用户 - selectUser() { - this.nodeUserDialogVisible=true - req.getUsers(this.nextNode.candidateGroups[0]).then(res => { - var users = res.data - var sid=""; - for(var i=0;i