|
@@ -6,7 +6,6 @@ import com.poteviohealth.cgp.statistics.mapper.OrderMapper;
|
|
|
import com.poteviohealth.cgp.statistics.model.outdto.OrderCostWebOutDTO;
|
|
import com.poteviohealth.cgp.statistics.model.outdto.OrderCostWebOutDTO;
|
|
|
import lombok.Data;
|
|
import lombok.Data;
|
|
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
import java.util.concurrent.RecursiveTask;
|
|
import java.util.concurrent.RecursiveTask;
|
|
|
|
|
|
|
@@ -38,7 +37,7 @@ public class CostOrderExcelTask extends RecursiveTask<List<OrderCostWebOutDTO>>
|
|
|
// 当end-start的值小于MAX时候，开始打印
|
|
// 当end-start的值小于MAX时候，开始打印
|
|
|
List<OrderCostWebOutDTO> list = Lists.newArrayList();
|
|
List<OrderCostWebOutDTO> list = Lists.newArrayList();
|
|
|
|
|
|
|
|
- int page = (end - start);
|
|
|
|
|
|
|
+ /* int page = (end - start);
|
|
|
if (page < 2) {
|
|
if (page < 2) {
|
|
|
// 小于最大值 直接执行
|
|
// 小于最大值 直接执行
|
|
|
list.addAll(orderMapper.costOrderExcel(queryWrapper,dbName,operatorId,(start-1)*MAX,MAX));
|
|
list.addAll(orderMapper.costOrderExcel(queryWrapper,dbName,operatorId,(start-1)*MAX,MAX));
|
|
@@ -56,9 +55,9 @@ public class CostOrderExcelTask extends RecursiveTask<List<OrderCostWebOutDTO>>
|
|
|
invokeAll(left, right);
|
|
invokeAll(left, right);
|
|
|
tasks.add(left);
|
|
tasks.add(left);
|
|
|
tasks.add(right);
|
|
tasks.add(right);
|
|
|
- addResultFromTasks(list, tasks);
|
|
|
|
|
|
|
+ addResultFromTasks(list, tasks);*/
|
|
|
return list;
|
|
return list;
|
|
|
- }
|
|
|
|
|
|
|
+ //}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 等待所有的任务运行结束
|
|
// 等待所有的任务运行结束
|
qin