fix: 修改任务审批

pull/118/head
sunchenliang 1 year ago
parent 78b2f03b6d
commit fd9a6a4666

@ -142,6 +142,7 @@ public class FlowTaskController extends BaseController {
@PostMapping("/completeFlow") @PostMapping("/completeFlow")
@ResponseBody @ResponseBody
public ResultVo complete(@RequestBody FlowApprove approve, HttpServletRequest request) { public ResultVo complete(@RequestBody FlowApprove approve, HttpServletRequest request) {
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
Integer flag = flowTaskService.complete(approve, userToken, Arrays.asList(approve.getFlowTaskInfoList().get(0).getFormId())); Integer flag = flowTaskService.complete(approve, userToken, Arrays.asList(approve.getFlowTaskInfoList().get(0).getFormId()));
return flag > 0 ? ResultVoUtil.success() : ResultVoUtil.error(); return flag > 0 ? ResultVoUtil.success() : ResultVoUtil.error();
@ -156,6 +157,11 @@ public class FlowTaskController extends BaseController {
@PostMapping("/completeBatchFlow") @PostMapping("/completeBatchFlow")
@ResponseBody @ResponseBody
public ResultVo completeBatch(@RequestBody FlowApprove approve, HttpServletRequest request) { public ResultVo completeBatch(@RequestBody FlowApprove approve, HttpServletRequest request) {
String tenantId = request.getHeader("X-Tenant-Id");
if(StringUtils.isBlank(tenantId)){
return ResultVoUtil.error("租户主键不能为空");
}
approve.setDeptid(tenantId);
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
//任务ID //任务ID
List<FlowTaskInfo> flowTaskInfoList = approve.getFlowTaskInfoList(); List<FlowTaskInfo> flowTaskInfoList = approve.getFlowTaskInfoList();

Loading…
Cancel
Save