From 2a52d5e20bfcc43aa962594bd84de4bf69c683a0 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Wed, 10 Jul 2024 14:08:31 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/report/mapper/ReportDeliverMapeer.java    |  4 ++--
 .../com/logpm/report/mapper/ReportDeliverMapper.xml |  1 +
 .../logpm/report/reader/DeliveryDetailReader.java   |  2 +-
 .../service/impl/ReportDeliverServiceImpl.java      | 13 ++++++++++---
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java
index 1136e53ed..8925195be 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapeer.java
@@ -58,11 +58,11 @@ public interface ReportDeliverMapeer extends BaseMapper {
 
 	/**
 	 * 查询零担明细
-	 * @param page
+	 *
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<ReportDetailVO> getDetailsZeroPage(IPage<ReportDetailVO> page,@Param("ew") Wrapper queryWrapper);
+	List<ReportDetailVO> getDetailsZeroPage(@Param("limitA") long limitA, @Param("limitB") long limitB, @Param("ew") Wrapper queryWrapper);
 	Long getDetailsZeroPageCount(@Param("ew") Wrapper queryWrapper);
 
 	List<DeliveryTrainLoadedScanDTO> getDeliveryTrainLoadSacnByIds(@Param("idBatch") List<Long> idBatch);
diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml
index 265fb13bd..d64746642 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml
@@ -642,6 +642,7 @@
     </sql>
     <select id="getDetailsZeroPage" resultType="com.logpm.report.vo.ReportDetailVO">
         <include refid="detailsZeroPage"></include>
+        limit #{limitA},#{limitB}
     </select>
     <select id="getStockOrderPage" resultType="com.logpm.report.vo.StockOrderVO">
         select waybill_number,
diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryDetailReader.java b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryDetailReader.java
index 8bf17ecbb..8469c878c 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryDetailReader.java
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryDetailReader.java
@@ -35,7 +35,7 @@ public class DeliveryDetailReader implements ExportReader {
 	@Override
 	public List<T> findList(Page page, Wrapper query) {
 		List detailsPage = reportDeliverMapeer.getDetailsPage(page, query);
-		List detailsZeroPage = reportDeliverMapeer.getDetailsZeroPage(page, query);
+		List detailsZeroPage = reportDeliverMapeer.getDetailsZeroPage(page.getCurrent(), page.getSize(), query);
 		detailsPage.addAll(detailsZeroPage);
 		return detailsPage;
 	}
diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java
index eee647c07..641b954f1 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java
@@ -182,12 +182,19 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 			int zeroSize = zeroTotal % size;
 			IPage<ReportDetailVO> page1 = Condition.getPage(query);
 			page1.setCurrent(zeroCurrent);
+			long limitA = 0;
+			long limitB = 0;
 			if (NumberUtil.equals(zeroCurrent, 1)) {
-				page1.setSize(zeroSize);
+				if(zeroSize == 0){
+					zeroSize = size;
+				}
 			} else {
-				page1.setSize(size);
+				zeroSize = size;
+				limitA = (zeroCurrent - 1) * zeroSize;
 			}
-			List<ReportDetailVO> zeroPage = reportDeliverMapeer.getDetailsZeroPage(page1, queryWrapper);
+			limitB = zeroSize;
+			page1.setSize(zeroSize);
+			List<ReportDetailVO> zeroPage = reportDeliverMapeer.getDetailsZeroPage(limitA, limitB, queryWrapper);
 			detailsPage.addAll(zeroPage);
 		}
 		page.setTotal(allTotal);