From 9f9535f562cb8afdab63c8477ea2e3795651f25f Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 22 四月 2024 16:17:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/MentalAppointmentServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/MentalAppointmentServiceImpl.java b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/MentalAppointmentServiceImpl.java
index dc5bd5f..d0654b0 100644
--- a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/MentalAppointmentServiceImpl.java
+++ b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/MentalAppointmentServiceImpl.java
@@ -161,10 +161,10 @@
.eq(MentalAppointment::getBeginTimePoint, beginTimePoint)
.eq(MentalAppointment::getEndTimePoint, endTimePoint)
.in(MentalAppointment::getStatusFlag, Arrays.asList(
+ MentalAppointmentStatusEnum.WAIT_PAY.getCode(),
MentalAppointmentStatusEnum.WAIT_SERVICE.getCode(),
MentalAppointmentStatusEnum.IN_SERVICE.getCode()
))
- .isNotNull(MentalAppointment::getWorkerId)
);
List<Long> neWorkerIdList = sameTimeAppointmentList.stream().map(MentalAppointment::getWorkerId).collect(Collectors.toList());
--
Gitblit v1.7.1