|
@@ -599,7 +599,7 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
|
|
|
List<TaskParallel> linkTasks = finalTaskParallelMaps.getOrDefault(tasks.get(0).getProcessInstanceId(), null);
|
|
|
if (linkTasks != null && linkTasks.size() > 0) {
|
|
|
//处理审批状态
|
|
|
- this.integrationMethod(vor, linkTasks,vo.getTaskStatus());
|
|
|
+ this.integrationMethod(vor, linkTasks);
|
|
|
}
|
|
|
//设置上报批次
|
|
|
vor.setReportNumber(String.valueOf(tasks.get(0).getBatch()));
|
|
@@ -817,7 +817,7 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
|
|
|
/**
|
|
|
* 统合方法
|
|
|
*/
|
|
|
- private void integrationMethod(InformationQueryVO vo, List<TaskParallel> linkList,String taskStatus) {
|
|
|
+ private void integrationMethod(InformationQueryVO vo, List<TaskParallel> linkList) {
|
|
|
|
|
|
for (TaskParallel link : linkList) {
|
|
|
vo.setWaitingUserList
|