diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/appletscheduleplandetail/AppletSchedulePlanController.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/appletscheduleplandetail/AppletSchedulePlanController.java index 6454333..176c43e 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/appletscheduleplandetail/AppletSchedulePlanController.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/appletscheduleplandetail/AppletSchedulePlanController.java @@ -25,7 +25,7 @@ public class AppletSchedulePlanController extends BaseController { @Resource private ISchedulePlanDetailService planDetailService; - @ApiOperation("通过排班计划查询明细") + @ApiOperation("查询医生排班明细") @GetMapping("/getList") public R> getList(SchedulePlanDetail planDetail) { List list = planDetailService.getList(planDetail); diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/videoconsultation/VideoConsultationController.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/videoconsultation/VideoConsultationController.java index 2558bb3..3cb2071 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/videoconsultation/VideoConsultationController.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/videoconsultation/VideoConsultationController.java @@ -33,7 +33,7 @@ import org.springframework.web.bind.annotation.RestController; public class VideoConsultationController { @Value("${trtc.sdkappid}") - private String sdkappid; + private Long sdkappid; @Value("${trtc.secretid}") private String secretid; @Value("${trtc.secretkey}") @@ -44,7 +44,7 @@ public class VideoConsultationController { @ApiOperation("获取userSig") @GetMapping("getUserSig/{userId}") public R getUserSig(@PathVariable String userId) { - TLSSigAPIv2 sigAPIv2 = new TLSSigAPIv2(1600003294, "6b8b57a7eedb92b6646d1c81bd68681ab924e53b52069cd20b0f53c8e3801a18"); + TLSSigAPIv2 sigAPIv2 = new TLSSigAPIv2(sdkappid, secretkey); String userSig = sigAPIv2.genUserSig(userId, 36000); return R.ok(userSig); } diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/scheduleplandetail/SchedulePlanDetail.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/scheduleplandetail/SchedulePlanDetail.java index 75435b0..76e47d3 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/scheduleplandetail/SchedulePlanDetail.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/scheduleplandetail/SchedulePlanDetail.java @@ -1,16 +1,20 @@ package com.xinelu.manage.domain.scheduleplandetail; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.time.LocalDate; import java.time.LocalTime; import lombok.Data; +import org.springframework.data.annotation.Transient; /** * 医生排班计划明细表 * @TableName schedule_plan_detail */ @Data +@ApiModel("医生排班计划明细表") public class SchedulePlanDetail implements Serializable { /** * 主键 @@ -20,46 +24,61 @@ public class SchedulePlanDetail implements Serializable { /** * 排班计划主键 */ + @ApiModelProperty("排班计划主键") private Long schedulePlanId; /** * 医生主键 */ + @ApiModelProperty("医生主键") private Long doctorId; /** * 医生姓名 */ + @ApiModelProperty("医生姓名") private String doctorName; /** * 排班日期 */ + @ApiModelProperty("排班日期") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private LocalDate scheduleDate; /** * 开始时间 */ + @ApiModelProperty("开始时间") @JsonFormat(timezone = "GMT+8", pattern = "HH:mm") private LocalTime scheduleStartTime; /** * 结束时间 */ + @ApiModelProperty("结束时间") @JsonFormat(timezone = "GMT+8", pattern = "HH:mm") private LocalTime scheduleEndTime; /** * 预约状态(0:未预约,1:已预约) */ + @ApiModelProperty("预约状态(0:未预约,1:已预约)") private String applyState; /** * 启用状态(0启用 1停用) */ + @ApiModelProperty("启用状态(0:可预约 1:不可预约)") private String status; + /** + * 是否查询当前时间之后的时间 + */ + @ApiModelProperty("是否查询当前时间之后的时间,0:否,1:是") + @Transient + private Integer after; + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/scheduleplandetail/SchedulePlanDetailMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/scheduleplandetail/SchedulePlanDetailMapper.xml index e3e858b..692b2b7 100644 --- a/xinelu-nurse-manage/src/main/resources/mapper/manage/scheduleplandetail/SchedulePlanDetailMapper.xml +++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/scheduleplandetail/SchedulePlanDetailMapper.xml @@ -136,6 +136,15 @@ and schedule_date = #{scheduleDate,jdbcType=DATE} + + and DATE_FORMAT(schedule_start_time, '%H%i') <= DATE_FORMAT(#{scheduleStartTime}, '%H%i') + + + and DATE_FORMAT(schedule_end_time, '%H%i') >= DATE_FORMAT(#{scheduleEndTime}, '%H%i') + + + and DATE_FORMAT(schedule_end_time, '%H%i') < DATE_FORMAT(now(), '%H%i') +