导出任务

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

@@ -196,7 +196,7 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
         List<OrderExcelDTO> list = Lists.newArrayList();
         ForkJoinPool pool = new ForkJoinPool();
         try {
-            OrderExcelTask task = new OrderExcelTask(1,maxPage, JSONObject.toJSONString(queryWrapper), operatorId, dbName,baseMapper);
+            OrderExcelTask task = new OrderExcelTask(1,maxPage,queryWrapper, operatorId, dbName,baseMapper);
             Future<List<OrderExcelDTO>> future = pool.submit(task);
                 do {
                    pool.awaitTermination(1, TimeUnit.SECONDS);

src/main/java/com/poteviohealth/cgp/statistics/utils/OrderExcelTask.java

@@ -1,7 +1,6 @@
 package com.poteviohealth.cgp.statistics.utils;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
 import com.poteviohealth.cgp.common.integrated.order.model.PayAccount;
@@ -27,11 +26,11 @@ public class OrderExcelTask extends RecursiveTask<List<OrderExcelDTO>> {
     private static final int MAX = 10000;
     private int start;
     private int end;
-    private String queryWrapper;
+    private final QueryWrapper queryWrapper;
     private Integer operatorId;
     private String dbName;
     private OrderMapper orderMapper;
-    public OrderExcelTask(int start, int end, String queryWrapper,Integer operatorId,String dbName,OrderMapper orderMapper){
+    public OrderExcelTask(int start, int end, QueryWrapper queryWrapper,Integer operatorId,String dbName,OrderMapper orderMapper){
         super();
         this.end = end;
         this.start =start;
@@ -49,10 +48,11 @@ public class OrderExcelTask extends RecursiveTask<List<OrderExcelDTO>> {
          int page = (end - start);
         if (page < 2) {
             // 小于最大值 直接执行
+
             log.info("queryWrapper==="+ JSON.toJSONString(queryWrapper));
-                list.addAll(orderMapper.orderExcel(JSONObject.parseObject(queryWrapper, QueryWrapper.class),dbName,operatorId,(start-1)*MAX,MAX));
+                list.addAll(orderMapper.orderExcel(queryWrapper,dbName,operatorId,(start-1)*MAX,MAX));
                 if(page == 1){
-                    list.addAll(orderMapper.orderExcel(JSONObject.parseObject(queryWrapper, QueryWrapper.class),dbName,operatorId,(end-1)*MAX,MAX));
+                    list.addAll(orderMapper.orderExcel(queryWrapper,dbName,operatorId,(end-1)*MAX,MAX));
                 }
 
             for (OrderExcelDTO orderExcelDTO : list) {