From 6bc25b33e90d45904d1843e927fa709dfeb51d7f Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期一, 15 四月 2024 15:57:41 +0800
Subject: [PATCH] 4.15
---
rest/src/main/java/cn/stylefeng/rest/modular/order/controller/MentalTestOrderController.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/order/controller/MentalTestOrderController.java b/rest/src/main/java/cn/stylefeng/rest/modular/order/controller/MentalTestOrderController.java
index 3b1c8a5..b311197 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/order/controller/MentalTestOrderController.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/order/controller/MentalTestOrderController.java
@@ -5,14 +5,8 @@
import cn.hutool.core.util.StrUtil;
import cn.stylefeng.guns.modular.business.dto.request.CreateOrderConsultOneRequest;
import cn.stylefeng.guns.modular.business.dto.request.CreateOrderMentalTestRequest;
-import cn.stylefeng.guns.modular.business.entity.MentalAnalysisTime;
-import cn.stylefeng.guns.modular.business.entity.MentalAppointment;
-import cn.stylefeng.guns.modular.business.entity.OrderConsultOne;
-import cn.stylefeng.guns.modular.business.entity.OrderMentalTest;
-import cn.stylefeng.guns.modular.business.service.IMentalAnalysisTimeService;
-import cn.stylefeng.guns.modular.business.service.IMentalAppointmentService;
-import cn.stylefeng.guns.modular.business.service.IOrderConsultOneService;
-import cn.stylefeng.guns.modular.business.service.IOrderMentalTestService;
+import cn.stylefeng.guns.modular.business.entity.*;
+import cn.stylefeng.guns.modular.business.service.*;
import cn.stylefeng.rest.modular.order.service.MentalTestOrderBizService;
import cn.stylefeng.roses.kernel.auth.api.context.LoginContext;
import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser;
@@ -33,7 +27,11 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
+import java.util.stream.Collectors;
@Slf4j
@Api(tags = "心理测试接口")
@@ -64,14 +62,31 @@
return new SuccessResponseData(o);
}
+ @Resource
+ private IMentalAnalysisTimeConfigService mentalAnalysisTimeConfigService;
+
@ApiOperation(value = "1V1咨询可预约时间")
@GetResource(name = "1V1咨询可预约时间", path = "/mentalAnalysisTime")
public ResponseData<List<MentalAnalysisTime>> mentalAnalysisTime() {
- List<MentalAnalysisTime> list = mentalAnalysisTimeService.list(
- Wrappers.<MentalAnalysisTime>lambdaQuery()
- .orderByAsc(MentalAnalysisTime::getModuleNo, MentalAnalysisTime::getWeekDay, MentalAnalysisTime::getBeginTimePoint, MentalAnalysisTime::getEndTimePoint)
- );
- return new SuccessResponseData(list);
+// List<Customer> filteredCustomers = customerService.list(Wrappers.lambdaQuery(Customer.class).eq(Customer::getMentalAnalysisStatus,1)
+// .like(Customer::getPostIds, "31"));
+
+// if (filteredCustomers.isEmpty()) {
+ List<MentalAnalysisTime> list = mentalAnalysisTimeService.list(
+ Wrappers.<MentalAnalysisTime>lambdaQuery()
+ .orderByAsc(MentalAnalysisTime::getModuleNo, MentalAnalysisTime::getWeekDay, MentalAnalysisTime::getBeginTimePoint, MentalAnalysisTime::getEndTimePoint)
+ );
+ return new SuccessResponseData(list);
+// }else {
+// List<Long> collect = filteredCustomers.stream().map(Customer::getCustomerId).collect(Collectors.toList());
+// List<MentalAnalysisTimeConfig> list = mentalAnalysisTimeConfigService.list(Wrappers.lambdaQuery(MentalAnalysisTimeConfig.class).in(MentalAnalysisTimeConfig::getCounsellingInfoId, collect));
+// HashMap<String,MentalAnalysisTimeConfig> hashMap =new HashMap<>();
+// for (MentalAnalysisTimeConfig mentalAnalysisTimeConfig : list) {
+// hashMap.put(mentalAnalysisTimeConfig.getWeekDay()+mentalAnalysisTimeConfig.getBeginTimePoint()+mentalAnalysisTimeConfig.getEndTimePoint(),mentalAnalysisTimeConfig);
+// }
+// Collection<MentalAnalysisTimeConfig> values = hashMap.values();
+// return new SuccessResponseData(values);
+// }
}
@Resource
--
Gitblit v1.7.1