From 94e9dc3adb80baf6e1d7d56e54a93917996bc339 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 28 四月 2024 11:21:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
rest/src/main/java/cn/stylefeng/rest/modular/worker/controller/MentalAnalysisTimeConfigController.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/worker/controller/MentalAnalysisTimeConfigController.java b/rest/src/main/java/cn/stylefeng/rest/modular/worker/controller/MentalAnalysisTimeConfigController.java
index bec2c6d..179962d 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/worker/controller/MentalAnalysisTimeConfigController.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/worker/controller/MentalAnalysisTimeConfigController.java
@@ -56,7 +56,7 @@
@ApiImplicitParam(name = "searchEndTime", value = "结束时间", dataTypeClass = String.class, paramType = "query"),
@ApiImplicitParam(name = "userNickName", value = "用户姓名", dataTypeClass = String.class, paramType = "query"),
@ApiImplicitParam(name = "userTelephone", value = "联系电话", dataTypeClass = String.class, paramType = "query"),
- @ApiImplicitParam(name = "statusFlag", value = "状态：0预约中，2服务中，3已完成，9已取消", dataTypeClass = Integer.class, paramType = "query"),
+ @ApiImplicitParam(name = "statusFlag", value = "状态：1已分配，2服务中，3已完成，9已取消", dataTypeClass = Integer.class, paramType = "query"),
})
public ResponseData<List<MentalAppointmentPageDTO>> mentalAnalysisTimeConfigSchedule(Long counsellingInfoId, String searchBeginTime, String searchEndTime, String userNickName, String userTelephone, Integer statusFlag) {
List<MentalAppointmentPageDTO> list = mentalAppointmentService.mentalAnalysisTimeConfigSchedule(searchBeginTime, searchEndTime, counsellingInfoId, null, userNickName, userTelephone, statusFlag, null);
@@ -71,7 +71,7 @@
@ApiImplicitParam(name = "counsellingInfoId", value = "性格分析师ID", dataTypeClass = Long.class, paramType = "query"),
@ApiImplicitParam(name = "userNickName", value = "用户姓名", dataTypeClass = String.class, paramType = "query"),
@ApiImplicitParam(name = "userTelephone", value = "联系电话", dataTypeClass = String.class, paramType = "query"),
- @ApiImplicitParam(name = "statusFlag", value = "状态：0预约中，2服务中，3已完成，9已取消", dataTypeClass = Integer.class, paramType = "query"),
+ @ApiImplicitParam(name = "statusFlag", value = "状态：1预约中，2服务中，3已完成，9已取消", dataTypeClass = Integer.class, paramType = "query"),
})
public ResponseData<PageResult<MentalAppointmentPageDTO>> mentalAnalysisTimeConfigSchedulePage(Integer pageNo, Integer pageSize, Long counsellingInfoId, String userNickName, String userTelephone, Integer statusFlag) {
Page<MentalAppointmentPageDTO> page = mentalAppointmentService.getPage(
@@ -174,7 +174,6 @@
DateTime dateTime = DateUtil.date();
String day = DateUtil.formatDate(dateTime);
String time = DateUtil.format(dateTime, "HH:mm");
-
List<MentalAppointment> list = mentalAppointmentService.list(
Wrappers.<MentalAppointment>lambdaUpdate()
.in(MentalAppointment::getStatusFlag, Arrays.asList(
--
Gitblit v1.7.1