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 | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index 35c3954..5d7d6ce 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -61,8 +61,7 @@
private static final Integer ORDER_STATUS_WAIT = 1;
private static final Integer ORDER_STATUS_RUNNING = 2;
private static final Integer ORDER_STATUS_COMPLETED = 3;
- //private static final Integer ORDER_STATUS_END = 4; // 宸插彇娑�
- private static final Integer ORDER_STATUS_END = 5;
+ private static final Integer ORDER_STATUS_PAUSED = 4;
/********************************************************鍩虹绫�*****************************************************/
@GetMapping("/todos")
@@ -163,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);
}
@@ -261,14 +260,13 @@
}
Integer statusFromParam = parseOrderStatus(status);
if (!isBlank(status) && statusFromParam == null && !"all".equalsIgnoreCase(status.trim())) {
- return R.fail("status鍙傛暟涓嶅悎娉曪紝鍙�夊�硷細all/waiting/inProgress/completed/end 鎴� 1/2/3/5");
+ return R.fail("status鍙傛暟涓嶅悎娉曪紝鍙�夊�硷細all/waiting/inProgress/completed/paused 鎴� 1/2/3/4");
}
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();
@@ -283,7 +281,7 @@
long waitingCount = 0L;
long inProgressCount = 0L;
long completedCount = 0L;
- long endCount = 0L;
+ long pausedCount = 0L;
List<Map<String, Object>> statusCountRows = productionOrderMapper.countHomeOrderProgressByStatus(startTime, endTime);
if (statusCountRows != null) {
for (Map<String, Object> countRow : statusCountRows) {
@@ -295,8 +293,8 @@
inProgressCount = cnt;
} else if (Objects.equals(statusKey, ORDER_STATUS_COMPLETED)) {
completedCount = cnt;
- } else if (Objects.equals(statusKey, ORDER_STATUS_END)) {
- endCount = cnt;
+ } else if (Objects.equals(statusKey, ORDER_STATUS_PAUSED)) {
+ pausedCount = cnt;
}
}
}
@@ -305,13 +303,13 @@
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);
result.put("inProgressCount", inProgressCount);
result.put("completedCount", completedCount);
- result.put("endCount", endCount);
+ result.put("pausedCount", pausedCount);
result.put("records", records);
return R.ok(result);
}
@@ -531,8 +529,8 @@
if ("3".equals(normalized) || "completed".equals(normalized)) {
return ORDER_STATUS_COMPLETED;
}
- if ("5".equals(normalized) || "end".equals(normalized)) {
- return ORDER_STATUS_END;
+ if ("4".equals(normalized) || "paused".equals(normalized)) {
+ return ORDER_STATUS_PAUSED;
}
return null;
}
@@ -544,8 +542,8 @@
if (Objects.equals(status, ORDER_STATUS_COMPLETED)) {
return "completed";
}
- if (Objects.equals(status, ORDER_STATUS_END)) {
- return "end";
+ if (Objects.equals(status, ORDER_STATUS_PAUSED)) {
+ return "paused";
}
if (Objects.equals(status, ORDER_STATUS_WAIT)) {
return "waiting";
@@ -563,8 +561,8 @@
if (Objects.equals(status, ORDER_STATUS_COMPLETED)) {
return "completed";
}
- if (Objects.equals(status, ORDER_STATUS_END)) {
- return "end";
+ if (Objects.equals(status, ORDER_STATUS_PAUSED)) {
+ return "paused";
}
return "all";
}
@@ -579,8 +577,8 @@
if (Objects.equals(status, ORDER_STATUS_COMPLETED)) {
return "宸插畬鎴�";
}
- if (Objects.equals(status, ORDER_STATUS_END)) {
- return "宸茬粨鏉�";
+ if (Objects.equals(status, ORDER_STATUS_PAUSED)) {
+ return "宸叉殏鍋�";
}
return "鏈煡";
}
@@ -637,7 +635,7 @@
.select(ProductionOrder::getQuantity, ProductionOrder::getCompleteQuantity)
.ge(ProductionOrder::getCreateTime, day.atStartOfDay())
.lt(ProductionOrder::getCreateTime, day.plusDays(1).atStartOfDay())
- .ne(ProductionOrder::getStatus, ORDER_STATUS_END));
+ .ne(ProductionOrder::getStatus, ORDER_STATUS_PAUSED));
BigDecimal totalQuantity = BigDecimal.ZERO;
BigDecimal totalCompleteQuantity = BigDecimal.ZERO;
--
Gitblit v1.9.3