Browse Source

完善刷新业务前端时功能报错的bug

master
yxt_djz 3 years ago
parent
commit
4ee9cbfe38
  1. 2
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java
  2. 6
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
  3. 15
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java

2
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java

@ -112,5 +112,5 @@ public interface FlowableFeign {
@ApiOperation(value = "终止流程")
@PostMapping(value = "/breakProcess")
@ResponseBody
ResultBean breakProcess(@RequestBody com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl);
ResultBean<UpdateFlowFieldVo> breakProcess(@RequestBody com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl);
}

6
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@ -354,10 +354,10 @@ public class FlowableRest implements FlowableFeign {
}
@Override
public ResultBean breakProcess(com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl) {
ResultBean rb = ResultBean.fireFail();
public ResultBean<UpdateFlowFieldVo> breakProcess(com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl) {
ResultBean<UpdateFlowFieldVo> rb = ResultBean.fireFail();
UpdateFlowFieldVo vo = new UpdateFlowFieldVo();
ResultBean resultBean = flowableService.breakProcess(fl);
ResultBean<UpdateFlowFieldVo> resultBean = flowableService.breakProcess(fl);
if (!resultBean.getSuccess()) {
return resultBean;
}

15
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java

@ -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) {

Loading…
Cancel
Save