From dd6313419318b1e544ddb0f5a3385bb905fc6cf0 Mon Sep 17 00:00:00 2001
From: goupan <goupan@chinapopin.com>
Date: 星期一, 29 四月 2024 01:31:04 +0800
Subject: [PATCH] 修复改出的问题
---
rest/src/main/java/cn/stylefeng/rest/modular/user/controller/MyMentalTestController.java | 7 -------
common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/MentalAppointmentServiceImpl.java | 2 +-
2 files changed, 1 insertions(+), 8 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 7f3905e..27ccd33 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
@@ -159,7 +159,7 @@
.isNull(MentalAppointment::getType)
.eq(MentalAppointment::getAppointmentDay, appointmentDayYmd)
.eq(MentalAppointment::getBeginTimePoint, beginTimePoint)
- .eq(MentalAppointment::getEndTimePoint, endTimePoint).ne(MentalAppointment::getType,1)
+ .eq(MentalAppointment::getEndTimePoint, endTimePoint)
.in(MentalAppointment::getStatusFlag, Arrays.asList(
MentalAppointmentStatusEnum.WAIT_PAY.getCode(),
MentalAppointmentStatusEnum.WAIT_SERVICE.getCode(),
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/MyMentalTestController.java b/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/MyMentalTestController.java
index 2094861..a824941 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/MyMentalTestController.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/MyMentalTestController.java
@@ -9,7 +9,6 @@
import cn.stylefeng.guns.modular.business.dto.MentalTestMyTestTopicDTO;
import cn.stylefeng.guns.modular.business.dto.MentalTestTopicAndRecordDTO;
import cn.stylefeng.guns.modular.business.entity.MentalTestRecord;
-import cn.stylefeng.guns.modular.business.entity.MentalTestResult;
import cn.stylefeng.guns.modular.business.entity.MentalTestTopic;
import cn.stylefeng.guns.modular.business.entity.OrderMentalTest;
import cn.stylefeng.guns.modular.business.service.*;
@@ -106,12 +105,6 @@
}
List<Long> topicIdList = list.stream().map(o -> o.getTopicId()).collect(Collectors.toList());
- List<MentalTestResult> mentalTestResultAll = mentalTestResultService.list(
- Wrappers.<MentalTestResult>lambdaQuery()
- .eq(MentalTestResult::getUserId, userId)
- .in(MentalTestResult::getTopicId, topicIdList)
- .groupBy(MentalTestResult::getTopicId)
- );
List<OrderMentalTest> orderMentalTestAll = orderMentalTestService.list(
Wrappers.<OrderMentalTest>lambdaQuery()
.eq(OrderMentalTest::getUserId, userId)
--
Gitblit v1.7.1