|
|
@ -1,10 +1,7 @@ |
|
|
|
package com.yxt.anrui.flowable.biz.flow; |
|
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil; |
|
|
|
import com.yxt.anrui.flowable.api.flow.FlowTaskQuery; |
|
|
|
import com.yxt.anrui.flowable.api.flow.FlowTaskVo; |
|
|
|
import com.yxt.anrui.flowable.api.flow.Flowable; |
|
|
|
import com.yxt.anrui.flowable.api.flow.TaskQuery; |
|
|
|
import com.yxt.anrui.flowable.api.flow.*; |
|
|
|
import com.yxt.anrui.flowable.api.flowtask.FlowTask; |
|
|
|
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; |
|
|
|
import com.yxt.anrui.flowable.api.utils.ProcessStateEnum; |
|
|
@ -236,16 +233,16 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable |
|
|
|
* @param flowTaskVo |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean breakProcess(com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo) { |
|
|
|
public ResultBean<UpdateFlowFieldVo> breakProcess(com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo) { |
|
|
|
/* com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); |
|
|
|
BeanUtil.copyProperties(flowTaskVo, fl);*/ |
|
|
|
ResultBean resultBean = flowTaskService.breakProcess(flowTaskVo); |
|
|
|
ResultBean<UpdateFlowFieldVo> resultBean = flowTaskService.breakProcess(flowTaskVo); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
return resultBean; |
|
|
|
} |
|
|
|
Map<String, String> map = new HashMap<>(); |
|
|
|
map.put("nodeState", String.valueOf(resultBean.getData())); |
|
|
|
return resultBean.success().setData(map); |
|
|
|
UpdateFlowFieldVo vo=new UpdateFlowFieldVo(); |
|
|
|
vo.setNodeState(String.valueOf(resultBean.getData())); |
|
|
|
return resultBean.success().setData(vo); |
|
|
|
} |
|
|
|
|
|
|
|
public void stopProcess(FlowTaskVo flowTaskVo) { |
|
|
|