qin 1 年之前
父節點
當前提交
7357639eca

+ 2 - 2
src/main/java/com/poteviohealth/cgp/statistics/service/impl/OrderServiceImpl.java

@@ -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();
                 }

+ 1 - 1
src/main/java/com/poteviohealth/cgp/statistics/utils/OrderExcelTask.java

@@ -16,7 +16,7 @@ import java.util.concurrent.RecursiveTask;
 @Data
 public class OrderExcelTask extends RecursiveTask<List<OrderExcelDTO>> {
 
-    private static final int MAX = 1000;
+    private static final int MAX = 10000;
     private int start;
     private int end;
     private QueryWrapper queryWrapper;