后台管理预约列表

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/CounselorController.java

@@ -17,7 +17,9 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.scale.domain.bo.CounselorBo;
 import org.dromara.scale.domain.vo.CounselorVo;
+import org.dromara.scale.domain.vo.ReservationOrderListVo;
 import org.dromara.scale.service.ICounselorService;
+import org.dromara.scale.service.IReservationService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -36,6 +38,7 @@ import java.util.List;
 public class CounselorController extends BaseController {
 
     private final ICounselorService counselorService;
+    private final IReservationService reservationService;
 
     /**
      * 查询心理咨询师列表
@@ -65,7 +68,7 @@ public class CounselorController extends BaseController {
     @SaCheckPermission("sys:counselor:query")
     @GetMapping("/{id}")
     public R<CounselorVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
+                                  @PathVariable Long id) {
         return R.ok(counselorService.queryById(id));
     }
 
@@ -102,4 +105,13 @@ public class CounselorController extends BaseController {
     public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long id) {
         return toAjax(counselorService.deleteWithValidById(id, true));
     }
+
+    /**
+     * 查询心理咨询师列表
+     */
+    @SaCheckPermission("counselor:reservation:list")
+    @GetMapping("/reservation/list")
+    public TableDataInfo<ReservationOrderListVo> list(Long counselorId, PageQuery pageQuery) {
+        return reservationService.queryAllReservationPageList(counselorId, pageQuery);
+    }
 }

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationTimeMapper.java

@@ -17,6 +17,7 @@ import org.dromara.scale.domain.vo.ReservationTimeVo;
 @Mapper
 public interface ReservationTimeMapper extends BaseMapperPlus<ReservationTime, ReservationTimeVo> {
 
-    Page<ReservationOrderListVo> selectPageList(@Param("page") Page<ReservationTime> page, @Param("counselorId") Long counselorId);
+    Page<ReservationOrderListVo> selectNotUsePageList(@Param("page") Page<ReservationTime> page, @Param("counselorId") Long counselorId);
 
+    Page<ReservationOrderListVo> selectAllPageList(@Param("page") Page<ReservationTime> page, @Param("counselorId") Long counselorId);
 }

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationService.java

@@ -20,6 +20,7 @@ public interface IReservationService {
      * @return 心理咨询师分页列表
      */
     TableDataInfo<ReservationOrderListVo> queryReservationPageList(PageQuery pageQuery);
+    TableDataInfo<ReservationOrderListVo> queryAllReservationPageList(Long counselorId,PageQuery pageQuery);
 
     /**
      * 新增预约

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java

@@ -51,7 +51,13 @@ public class ReservationServiceImpl implements IReservationService {
     @Override
     public TableDataInfo<ReservationOrderListVo> queryReservationPageList(PageQuery pageQuery) {
         Long userId = LoginHelper.getUserId();
-        Page<ReservationOrderListVo> result = timeMapper.selectPageList(pageQuery.build(), userId);
+        Page<ReservationOrderListVo> result = timeMapper.selectNotUsePageList(pageQuery.build(), userId);
+        return TableDataInfo.build(result);
+    }
+
+    @Override
+    public TableDataInfo<ReservationOrderListVo> queryAllReservationPageList(Long counselorId, PageQuery pageQuery) {
+        Page<ReservationOrderListVo> result = timeMapper.selectAllPageList(pageQuery.build(), counselorId);
         return TableDataInfo.build(result);
     }
 

ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationTimeMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.scale.mapper.ReservationTimeMapper">
 
-    <select id="selectPageList" resultType="org.dromara.scale.domain.vo.ReservationOrderListVo">
+    <select id="selectNotUsePageList" resultType="org.dromara.scale.domain.vo.ReservationOrderListVo">
         select u.nick_name                          as name,
                rt.id                                as timeId,
                ro.id                                as orderId,
@@ -20,4 +20,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and ro.order_status = 1
         order by rt.start_time
     </select>
+
+    <select id="selectAllPageList" resultType="org.dromara.scale.domain.vo.ReservationOrderListVo">
+        select u.nick_name                          as name,
+               rt.id                                as timeId,
+               ro.id                                as orderId,
+               DATE_FORMAT(rt.start_time, '%H:%i')  as startTime,
+               DATE_FORMAT(rt.end_time, '%H:%i')    as endTime,
+               DATE_FORMAT(rd.day_time, '%Y-%m-%d') as dayTime,
+               rt.status                            as `status`
+        from m_reservation_time rt
+                 left join m_reservation_day rd on rd.id = rt.day_id
+                 left join m_reservation_order ro on ro.time_id = rt.id
+                 left join sys_user u on u.user_id = ro.create_by
+        where rt.status &gt; 0
+          and rt.counselor_id = #{counselorId}
+        order by rt.start_time desc
+    </select>
 </mapper>