From a2e45f7216838aa7ee7212955911ae2e300a9ec7 Mon Sep 17 00:00:00 2001 From: goupan <goupan@chinapopin.com> Date: 星期二, 09 四月 2024 14:44:51 +0800 Subject: [PATCH] 代码提交 --- common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalAppointmentPageDTO.java | 4 ++-- guns/src/main/java/cn/stylefeng/guns/modular/business/controller/UserManageController.java | 2 +- rest/src/main/java/cn/stylefeng/rest/modular/worker/controller/MentalAnalysisTimeConfigController.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalAppointmentPageDTO.java b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalAppointmentPageDTO.java index 109216a..fb52199 100644 --- a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalAppointmentPageDTO.java +++ b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/MentalAppointmentPageDTO.java @@ -14,8 +14,8 @@ @ApiModelProperty(value = "预约ID") @ChineseDescription("预约ID") private Long id; - @ApiModelProperty(value = "状态:0预约中,2服务中,3已完成,9已取消") - @ChineseDescription("状态:0预约中,2服务中,3已完成,9已取消") + @ApiModelProperty(value = "状态:1预约中,2服务中,3已完成,9已取消") + @ChineseDescription("状态:1预约中,2服务中,3已完成,9已取消") private Integer statusFlag; @ApiModelProperty(value = "预约类型") diff --git a/guns/src/main/java/cn/stylefeng/guns/modular/business/controller/UserManageController.java b/guns/src/main/java/cn/stylefeng/guns/modular/business/controller/UserManageController.java index 0e7a325..b1b3ec7 100644 --- a/guns/src/main/java/cn/stylefeng/guns/modular/business/controller/UserManageController.java +++ b/guns/src/main/java/cn/stylefeng/guns/modular/business/controller/UserManageController.java @@ -284,7 +284,7 @@ @ApiImplicitParam(name = "userId", value = "用户ID", dataTypeClass = Long.class), @ApiImplicitParam(name = "name", value = "咨询师姓名", dataTypeClass = String.class), @ApiImplicitParam(name = "telephone", value = "咨询师电话", dataTypeClass = String.class), - @ApiImplicitParam(name = "statusFlag", value = "状态:0预约中,2服务中,3已完成,9已取消", dataTypeClass = Integer.class), + @ApiImplicitParam(name = "statusFlag", value = "状态:1预约中,2服务中,3已完成,9已取消", dataTypeClass = Integer.class), }) public ResponseData<PageResult<UserMentalAppointmentPageResponseDTO>> userMentalAppointmentPage(Integer pageNo, Integer pageSize, Long userId, String name, String telephone, Integer statusFlag) { Page<UserMentalAppointmentPageResponseDTO> page = mentalAppointmentService.userMentalAppointmentPage( 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..0b344fe 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( -- Gitblit v1.7.1