From 8769d3a9688e1dfb45f51b5ac72f059b188631d2 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 23 六月 2026 15:50:22 +0800
Subject: [PATCH] 首页生产订单进度记录全部数量错误
---
src/main/java/com/ruoyi/home/controller/HomeController.java | 7 ++++---
src/main/resources/mapper/production/ProductionOrderMapper.xml | 4 +++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index 7878d28..48a2185 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -265,8 +265,9 @@
Integer queryStatus = resolveOrderStatus(status, tab);
long safePageNum = pageNum == null || pageNum < 1 ? 1 : pageNum;
- long safePageSize = pageSize == null || pageSize < 1 ? 10 : Math.min(pageSize, 50);
- long offset = (safePageNum - 1) * safePageSize;
+ boolean queryAll = pageSize != null && pageSize == -1;
+ long safePageSize = queryAll ? -1 : (pageSize == null || pageSize < 1 ? 10 : Math.min(pageSize, 50));
+ long offset = queryAll ? 0 : (safePageNum - 1) * safePageSize;
LocalDateTime startTime = queryDate == null ? null : queryDate.atStartOfDay();
LocalDateTime endTime = queryDate == null ? null : queryDate.plusDays(1).atStartOfDay();
@@ -303,7 +304,7 @@
result.put("tab", mapOrderTab(queryStatus));
result.put("status", mapOrderStatus(queryStatus));
result.put("bizDate", queryDate == null ? null : queryDate.format(DATE_FORMATTER));
- result.put("total", toLong(productionOrderMapper.countHomeOrderProgress(queryStatus, startTime, endTime)));
+ result.put("total", toLong(productionOrderMapper.countHomeOrderProgress(null, startTime, endTime)));
result.put("pageNum", safePageNum);
result.put("pageSize", safePageSize);
result.put("waitingCount", waitingCount);
diff --git a/src/main/resources/mapper/production/ProductionOrderMapper.xml b/src/main/resources/mapper/production/ProductionOrderMapper.xml
index 8e64413..67cc55b 100644
--- a/src/main/resources/mapper/production/ProductionOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderMapper.xml
@@ -233,7 +233,9 @@
</if>
</where>
order by po.id desc
- limit #{offset}, #{size}
+ <if test="size != null and size >= 0">
+ limit #{offset}, #{size}
+ </if>
</select>
<select id="countHomeOrderProgress" resultType="java.lang.Long">
--
Gitblit v1.9.3