From 727d4605fd6826ee9078553b5c7626b7803629d8 Mon Sep 17 00:00:00 2001
From: goupan <goupan@chinapopin.com>
Date: 星期一, 29 四月 2024 01:08:43 +0800
Subject: [PATCH] 修复改出的问题
---
common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/MentalAppointmentServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 81332d8..7f3905e 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
@@ -26,7 +26,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -157,6 +156,7 @@
// 获取预约时段有服务的分析师（不可预约）
List<MentalAppointment> sameTimeAppointmentList = mentalAppointmentService.list(
Wrappers.<MentalAppointment>lambdaQuery()
+ .isNull(MentalAppointment::getType)
.eq(MentalAppointment::getAppointmentDay, appointmentDayYmd)
.eq(MentalAppointment::getBeginTimePoint, beginTimePoint)
.eq(MentalAppointment::getEndTimePoint, endTimePoint).ne(MentalAppointment::getType,1)
@@ -185,7 +185,7 @@
// 获取当前星期
Integer weekDay = DateUtil.dayOfWeekEnum(appointmentDay).getIso8601Value();
// 预约时间段配置匹配的性格分析师
- List<MentalAnalysisTimeConfig> eqWorkerTimeConfigList = mentalAnalysisTimeConfigService.getWorkerListByAppointmentTime(CustomerMentalAnalysisStatusEnum.ON_WORK.getCode(), weekDay, appointmentDayYmd, beginTimePoint, endTimePoint);
+ List<MentalAnalysisTimeConfig> eqWorkerTimeConfigList = mentalAnalysisTimeConfigService.getWorkerListByAppointmentTime(CustomerWorkStatusEnum.ON_WORK.getCode(), CustomerMentalAnalysisStatusEnum.ON_WORK.getCode(), weekDay, appointmentDayYmd, beginTimePoint, endTimePoint);
// 分析师ID（预约时间段配置匹配）
List<Long> eqWorkerIdByTimeConfigList = eqWorkerTimeConfigList.isEmpty() ? Collections.singletonList(0L) :
eqWorkerTimeConfigList.stream()
--
Gitblit v1.7.1