From e93b99732741d213626a65932c8a3af7081a2d30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Thu, 4 Jul 2024 16:29:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A6=96=E9=A1=B5=E7=BB=9F?=
=?UTF-8?q?=E8=AE=A1=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../xhx/module/ph/service/impl/PhQueueStatServiceImpl.java | 4 ++--
.../java/com/mortals/httpclient/ph/PhQueueController.http | 4 ++--
.../java/com/mortals/httpclient/ph/PhQueueStatController.http | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/bill-manager/src/main/java/com/mortals/xhx/module/ph/service/impl/PhQueueStatServiceImpl.java b/bill-manager/src/main/java/com/mortals/xhx/module/ph/service/impl/PhQueueStatServiceImpl.java
index 02fbf3c..42646da 100644
--- a/bill-manager/src/main/java/com/mortals/xhx/module/ph/service/impl/PhQueueStatServiceImpl.java
+++ b/bill-manager/src/main/java/com/mortals/xhx/module/ph/service/impl/PhQueueStatServiceImpl.java
@@ -207,7 +207,7 @@ public class PhQueueStatServiceImpl extends AbstractCRUDServiceImpl<PhQueueStatD
private void updateSiteBussinessPhCount(String currentDate, PhQueueStatEntity entity, List<PhQueueEntity> phQueueEntities) {
- Map<String, List<PhQueueEntity>> collect = phQueueEntities.stream().collect(Collectors.groupingBy(x -> x.getSectionName()));
+ Map<String, List<PhQueueEntity>> collect = phQueueEntities.stream().collect(Collectors.groupingBy(x -> x.getBusiness()));
collect.entrySet().stream().forEach(item -> {
String bussiness = item.getKey();
if (ObjectUtils.isEmpty(bussiness)) return;
@@ -251,7 +251,7 @@ public class PhQueueStatServiceImpl extends AbstractCRUDServiceImpl<PhQueueStatD
private void updateSiteWindowPhCount(String currentDate, PhQueueStatEntity entity, List<PhQueueEntity> phQueueEntities) {
- Map<String, List<PhQueueEntity>> collect = phQueueEntities.stream().collect(Collectors.groupingBy(x -> x.getSectionName()));
+ Map<String, List<PhQueueEntity>> collect = phQueueEntities.stream().collect(Collectors.groupingBy(x -> x.getWindowFromnum()));
collect.entrySet().stream().forEach(item -> {
String window = item.getKey();
if (ObjectUtils.isEmpty(window)) return;
diff --git a/bill-manager/src/test/java/com/mortals/httpclient/ph/PhQueueController.http b/bill-manager/src/test/java/com/mortals/httpclient/ph/PhQueueController.http
index 092480b..1382445 100644
--- a/bill-manager/src/test/java/com/mortals/httpclient/ph/PhQueueController.http
+++ b/bill-manager/src/test/java/com/mortals/httpclient/ph/PhQueueController.http
@@ -14,11 +14,11 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
%}
###鎺掑彿姹囨€诲垪琛�
-POST {{baseUrl}}/ph/queue/list
+POST {{baseUrl}}/ph/queue/interlist
Content-Type: application/json
{
- "page":1,
+ "page":2,
"size":10
}
diff --git a/bill-manager/src/test/java/com/mortals/httpclient/ph/PhQueueStatController.http b/bill-manager/src/test/java/com/mortals/httpclient/ph/PhQueueStatController.http
index f4755ce..5e9547c 100644
--- a/bill-manager/src/test/java/com/mortals/httpclient/ph/PhQueueStatController.http
+++ b/bill-manager/src/test/java/com/mortals/httpclient/ph/PhQueueStatController.http
@@ -21,11 +21,11 @@ Content-Type: application/json
"timeStart": "2023-04-01",
"timeEnd": "2024-07-04",
"siteId": 1,
- "sectionNameNotList": [""],
+ "hallNameNotList": [""],
"groupList": ["year","month","day"],
"page": 1,
- "size": 100
+ "size": 10
}
--
2.24.3