|
@@ -1,5 +1,6 @@
|
|
|
package com.poteviohealth.cgp.statistics.utils;
|
|
package com.poteviohealth.cgp.statistics.utils;
|
|
|
|
|
|
|
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.google.common.collect.Lists;
|
|
import com.google.common.collect.Lists;
|
|
@@ -48,7 +49,7 @@ public class OrderExcelTask extends RecursiveTask<List<OrderExcelDTO>> {
|
|
|
int page = (end - start);
|
|
int page = (end - start);
|
|
|
if (page < 2) {
|
|
if (page < 2) {
|
|
|
// 小于最大值 直接执行
|
|
// 小于最大值 直接执行
|
|
|
- log.info("queryWrapper==="+ queryWrapper.length());
|
|
|
|
|
|
|
+ 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(JSONObject.parseObject(queryWrapper, QueryWrapper.class),dbName,operatorId,(start-1)*MAX,MAX));
|
|
|
if(page == 1){
|
|
if(page == 1){
|
|
|
list.addAll(orderMapper.orderExcel(JSONObject.parseObject(queryWrapper, QueryWrapper.class),dbName,operatorId,(end-1)*MAX,MAX));
|
|
list.addAll(orderMapper.orderExcel(JSONObject.parseObject(queryWrapper, QueryWrapper.class),dbName,operatorId,(end-1)*MAX,MAX));
|