|
|
@@ -2,6 +2,7 @@ package com.gree.mall.manager.logic.workorder;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
+import cn.hutool.core.collection.ListUtil;
|
|
|
import cn.hutool.core.convert.Convert;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
@@ -1041,9 +1042,12 @@ public class OrderBaseEsLogic {
|
|
|
.eq(WorkerOrder::getPayStatus, MaterialExamineStatusEnum.PAID.getKey())
|
|
|
.select(WorkerOrder::getWorkerOrderId, WorkerOrder::getTotalAmount).list();
|
|
|
|
|
|
- List<OperatorLogBean> operatorList = null;
|
|
|
+ List<OperatorLogBean> operatorList = new ArrayList<>();
|
|
|
if (CollectionUtil.isNotEmpty(orderBaseIds)) {
|
|
|
- operatorList = commonMapper.selectLastOrderOperatorLog(year, orderBaseIds);
|
|
|
+ final List<List<String>> pageList = ListUtil.split(orderBaseIds, 100);
|
|
|
+ for (List<String> orderIdPageList : pageList) {
|
|
|
+ operatorList.addAll(commonMapper.selectLastOrderOperatorLog(year, orderIdPageList));
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
Map<String, List<OperatorLogBean>> operatorMap = null;
|
