Browse Source

feat(all): 修改配送明细报表逻辑

dist.1.3.0
zhaoqiaobo 6 months ago
parent
commit
d3a24baad0
  1. 5
      blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java

5
blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java

@ -1,5 +1,6 @@
package com.logpm.report.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
@ -36,6 +37,7 @@ import org.springblade.core.mp.support.Condition;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
/**
@ -194,6 +196,9 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
limitB = zeroSize;
page1.setSize(zeroSize);
List<ReportDetailVO> zeroPage = reportDeliverMapeer.getDetailsZeroPage(limitA, limitB, queryWrapper);
if(CollUtil.isEmpty(detailsPage)){
detailsPage = new ArrayList<>();
}
detailsPage.addAll(zeroPage);
}
page.setTotal(allTotal);

Loading…
Cancel
Save