|
|
@@ -189,7 +189,7 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
|
|
|
count = baseMapper.orderPageListSize(queryWrapper2,dbName,operatorId);
|
|
|
}
|
|
|
//每页1000条,计算总页数
|
|
|
- int maxPage = (int) Math.ceil(count/1000.0);
|
|
|
+ int maxPage = (int) Math.ceil(count/10000.0);
|
|
|
List<OrderExcelDTO> list = Lists.newArrayList();
|
|
|
ForkJoinPool pool = new ForkJoinPool();
|
|
|
OrderExcelTask task = new OrderExcelTask(1,maxPage, queryWrapper, operatorId, dbName,baseMapper);
|
|
|
@@ -197,7 +197,7 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
|
|
|
try {
|
|
|
do {
|
|
|
try {
|
|
|
- pool.awaitTermination(2, TimeUnit.SECONDS);
|
|
|
+ pool.awaitTermination(1, TimeUnit.SECONDS);
|
|
|
} catch (InterruptedException e) {
|
|
|
e.printStackTrace();
|
|
|
}
|