From 0f746d8324fb2ce65119627890b9c26ba1eaadd0 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 24 六月 2026 14:56:06 +0800
Subject: [PATCH] fix(sales): 修复客户交易查询中的合同金额计算问题
---
src/main/java/com/ruoyi/home/controller/HomeController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index 9bd23f6..48a2185 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -38,6 +38,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.*;
/**
* @author :yys
@@ -264,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();
@@ -302,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);
--
Gitblit v1.9.3