From 700f9d0da314a4ea701fe9f68d305b67d72ec5fb Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期三, 08 七月 2026 15:08:37 +0800
Subject: [PATCH] 各类修复fix
---
backend/src/main/java/com/sinata/appointment/service/DashboardApplicationService.java | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/backend/src/main/java/com/sinata/appointment/service/DashboardApplicationService.java b/backend/src/main/java/com/sinata/appointment/service/DashboardApplicationService.java
index 50ceae9..496e605 100644
--- a/backend/src/main/java/com/sinata/appointment/service/DashboardApplicationService.java
+++ b/backend/src/main/java/com/sinata/appointment/service/DashboardApplicationService.java
@@ -45,16 +45,15 @@
private final MpUserMapper mpUserMapper;
private final SysDeptMapper sysDeptMapper;
- public DashboardOverviewVo getOverview(LocalDate startDate, LocalDate endDate) {
- DateRange range = resolveRange(startDate, endDate);
- LocalDate dailyDate = resolveDailyDate(range);
+ public DashboardOverviewVo getOverview() {
+ LocalDate dailyDate = LocalDate.now();
DashboardOverviewVo vo = new DashboardOverviewVo();
- vo.setStartDate(format(range.startDate()));
- vo.setEndDate(format(range.endDate()));
+ vo.setStartDate(null);
+ vo.setEndDate(null);
vo.setDailyDate(format(dailyDate));
vo.setDailyAppointmentCount(countAppointments(dailyDate, dailyDate, null));
- vo.setTotalAppointmentCount(countAppointments(range.startDate(), range.endDate(), null));
+ vo.setTotalAppointmentCount(countAllAppointments());
vo.setRegisteredUserCount(countRegisteredUsers());
vo.setEmployeeCount(countEmployees());
return vo;
@@ -131,6 +130,11 @@
appointmentRangeWrapper(startDate, endDate, resolveDeptIds(visitedDeptId), null));
}
+ private long countAllAppointments() {
+ return appointmentOrderMapper.selectCount(
+ new LambdaQueryWrapper<AppointmentOrder>().eq(AppointmentOrder::getDelFlag, 0));
+ }
+
private LambdaQueryWrapper<AppointmentOrder> appointmentRangeWrapper(
LocalDate startDate, LocalDate endDate, List<Long> deptIds, String status) {
LambdaQueryWrapper<AppointmentOrder> wrapper =
@@ -204,7 +208,10 @@
}
private long countRegisteredUsers() {
- return mpUserMapper.selectCount(new LambdaQueryWrapper<MpUser>().eq(MpUser::getDelFlag, 0));
+ return mpUserMapper.selectCount(
+ new LambdaQueryWrapper<MpUser>()
+ .eq(MpUser::getDelFlag, 0)
+ .eq(MpUser::getUserType, MiniUserType.VISITOR));
}
private long countEmployees() {
@@ -225,14 +232,6 @@
return new DateRange(resolvedEnd, resolvedStart);
}
return new DateRange(resolvedStart, resolvedEnd);
- }
-
- private LocalDate resolveDailyDate(DateRange range) {
- LocalDate today = LocalDate.now();
- if (!today.isBefore(range.startDate()) && !today.isAfter(range.endDate())) {
- return today;
- }
- return range.endDate();
}
private LocalDateTime atStartOfDay(LocalDate date) {
--
Gitblit v1.7.1