From 47806d9e390ee00e1d29ad1da8c1aa908882a758 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 11 八月 2026 14:43:59 +0800
Subject: [PATCH] 用河南鹤壁代码覆盖山西长治
---
src/main/java/com/ruoyi/home/controller/HomeController.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index 48a2185..5d7d6ce 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -162,8 +162,8 @@
@GetMapping("/processOutputAnalysis")
@Operation(summary = "宸ュ簭浜у嚭鍒嗘瀽")
- public R processOutputAnalysis(@DefaultType Integer type){
- List<MapDto> list = homeService.processOutputAnalysis(type);
+ public R processOutputAnalysis(@DefaultType Integer dateType){
+ List<MapDto> list = homeService.processOutputAnalysis(dateType);
return R.ok(list);
}
@@ -265,9 +265,8 @@
Integer queryStatus = resolveOrderStatus(status, tab);
long safePageNum = pageNum == null || pageNum < 1 ? 1 : pageNum;
- 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;
+ long safePageSize = pageSize == null || pageSize < 1 ? 10 : Math.min(pageSize, 50);
+ long offset = (safePageNum - 1) * safePageSize;
LocalDateTime startTime = queryDate == null ? null : queryDate.atStartOfDay();
LocalDateTime endTime = queryDate == null ? null : queryDate.plusDays(1).atStartOfDay();
@@ -304,7 +303,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(null, startTime, endTime)));
+ result.put("total", toLong(productionOrderMapper.countHomeOrderProgress(queryStatus, startTime, endTime)));
result.put("pageNum", safePageNum);
result.put("pageSize", safePageSize);
result.put("waitingCount", waitingCount);
--
Gitblit v1.9.3