|
@@ -32,6 +32,7 @@ import org.springblade.core.tool.utils.Func;
|
|
|
import org.springblade.core.tool.utils.ObjectUtil;
|
|
|
import org.springblade.flow.core.entity.BladeFlow;
|
|
|
import org.springblade.flow.core.feign.NewFlowClient;
|
|
|
+import org.springblade.flow.core.vo.SendPageVO;
|
|
|
import org.springblade.manager.entity.ContractInfo;
|
|
|
import org.springblade.manager.feign.ContractClient;
|
|
|
import org.springblade.resource.feign.CommonFileClient;
|
|
@@ -220,8 +221,12 @@ public class TaskController extends BladeController {
|
|
|
//设置主表map,方便获取
|
|
|
Map<String, Task> masterTaskMap = new HashMap<>();
|
|
|
masterTaskList.forEach(task -> masterTaskMap.put(task.getProcessInstanceId(), task));
|
|
|
-
|
|
|
- R<Object> rObject = this.newFlowClient.selectSendPage(queryVO.getCurrent(), queryVO.getSize(), queryVO.getOrdType() == null ? 1 : queryVO.getOrdType(), String.join(",", processInstanceIds));
|
|
|
+ SendPageVO pageVO = new SendPageVO();
|
|
|
+ pageVO.setCurrent(queryVO.getCurrent());
|
|
|
+ pageVO.setSize(queryVO.getSize());
|
|
|
+ pageVO.setOrdType(queryVO.getOrdType() == null ? 1 : queryVO.getOrdType());
|
|
|
+ pageVO.setParallelProcessInstanceIds(String.join(",", processInstanceIds));
|
|
|
+ R<Object> rObject = this.newFlowClient.selectSendPage(pageVO);
|
|
|
if (rObject.isSuccess()) {
|
|
|
Query query = new Query();
|
|
|
query.setCurrent(queryVO.getCurrent());
|
|
@@ -404,6 +409,9 @@ public class TaskController extends BladeController {
|
|
|
List<String> parallelProcessInstanceIds = new ArrayList<>();
|
|
|
//统合查询方法
|
|
|
this.integrationMethod(queryVO, masterTaskMap, parallelMap, parallelProcessInstanceIds, "2,3");
|
|
|
+ if (masterTaskMap.size() == 0 || parallelMap.size() == 0) {
|
|
|
+ return R.data(null);
|
|
|
+ }
|
|
|
|
|
|
//获取已办(基于原生已办)
|
|
|
R<Object> rObject = this.newFlowClient.selectDonePage(queryVO.getCurrent(), queryVO.getSize(), queryVO.getOrdType() == null ? 1 : queryVO.getOrdType(), String.join(",", parallelProcessInstanceIds));
|
|
@@ -449,7 +457,7 @@ public class TaskController extends BladeController {
|
|
|
List<String> parallelProcessInstanceIds = new ArrayList<>();
|
|
|
//统合查询方法
|
|
|
this.integrationMethod(queryVO, masterTaskMap, parallelMap, parallelProcessInstanceIds, "1");
|
|
|
- if (masterTaskMap.size() == 0) {
|
|
|
+ if (masterTaskMap.size() == 0 || parallelMap.size() == 0) {
|
|
|
return R.data(null);
|
|
|
}
|
|
|
//获取待办(基于原生待办)
|