From 6373eaf4e5933be068ab99283aa77e7806a2ec90 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Mon, 27 Oct 2025 10:52:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=B0=B1=E9=A4=90=E4=BA=BA=E6=95=B0?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1-=E6=9C=AC=E5=B9=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pjcloud/hard/controller/panel/PanelCanteenController.java | 1 + .../hard/service/impl/panel/PanelCanteenServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/panel/PanelCanteenController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/panel/PanelCanteenController.java index f9f51c083..2c9a13927 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/panel/PanelCanteenController.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/panel/PanelCanteenController.java @@ -73,6 +73,7 @@ public class PanelCanteenController { dto.setTotalTimeList(DateRangeTool.transitionDateTypeToDateTimeList(dto.getDateRangeType())); } dto.setMchTypeCodes(List.of(MerchantTypeEnum.CANTEEN.getType())); + dto.setLimit(5L); return R.ok(panelCanteenService.mchPayPersonCount(dto)); } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/panel/PanelCanteenServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/panel/PanelCanteenServiceImpl.java index 420f8260d..df0b7874a 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/panel/PanelCanteenServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/panel/PanelCanteenServiceImpl.java @@ -47,7 +47,7 @@ public class PanelCanteenServiceImpl implements PanelCanteenService { PanelProductDto queryDto = BeanUtil.toBean(dto, PanelProductDto.class); queryDto.setHourType(hourType.getType()); List sqlList = new ArrayList<>(); - if (ObjectUtil.equals(dto.getDateRangeType(), DateRangeTypeEnum.THIS_YEAR.getType())) { + if (ObjectUtil.equals(dto.getDateRangeType(), DateRangeTypeEnum.THIS_YEAR)) { sqlList = hardOrderMapper.groupByMonthAndHourType(queryDto); } else { sqlList = hardOrderMapper.groupByTimeAndHourType(queryDto);