|
|
@ -178,10 +178,9 @@ public class FlowableRest implements FlowableFeign { |
|
|
|
sb.delete(sb.length() - 1, sb.length()); |
|
|
|
} |
|
|
|
pQuery.getParams().setOrgSid(sb.toString()); |
|
|
|
Page<com.yxt.anrui.flowable.api.flowtask.FlowTaskDto> data = flowableService.todoAllTaskList(userSid, pQuery).getData(); |
|
|
|
Page<FlowTaskDto> page = new Page<>(); |
|
|
|
|
|
|
|
BeanUtil.copyProperties(data,page); |
|
|
|
BeanUtil.copyProperties(flowableService.todoAllTaskList(userSid, pQuery).getData(),page); |
|
|
|
|
|
|
|
ResultBean< Page<FlowTaskDto>> success = new ResultBean< Page<FlowTaskDto>>().success(); |
|
|
|
success.setData(page); |
|
|
@ -211,10 +210,9 @@ public class FlowableRest implements FlowableFeign { |
|
|
|
@Override |
|
|
|
public ResultBean<Page<FlowTaskDto>> doneAllTaskList(String userSid, PagerQuery<FlowTaskAllQuery> pQuery) {//已办列表
|
|
|
|
ResultBean<Page<com.yxt.anrui.flowable.api.flowtask.FlowTaskDto>> pageResultBean = flowableService.doneAllTaskList(userSid, pQuery); |
|
|
|
Page<com.yxt.anrui.flowable.api.flowtask.FlowTaskDto> data = pageResultBean.getData(); |
|
|
|
Page<FlowTaskDto> page = new Page<>(); |
|
|
|
|
|
|
|
BeanUtil.copyProperties(data,page); |
|
|
|
BeanUtil.copyProperties(pageResultBean.getData(),page); |
|
|
|
|
|
|
|
ResultBean< Page<FlowTaskDto>> success = new ResultBean< Page<FlowTaskDto>>().success(); |
|
|
|
success.setData(page); |
|
|
|