From ee48e158371f874ee21de49a991ba06d2c2aa038 Mon Sep 17 00:00:00 2001 From: cjw Date: Wed, 21 Aug 2024 15:06:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=96=B0=E5=A2=9E=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=95=B0=E5=92=8C=E5=B7=B2=E7=94=A8=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/wx/WxCounselorController.java | 13 ++++++++++++- .../dromara/scale/domain/bo/CounselorBo.java | 10 ++++++++++ .../scale/domain/vo/ReservationDateVo.java | 2 ++ .../scale/domain/vo/ReservationOrderVo.java | 2 ++ .../scale/mapper/ReservationDayMapper.java | 4 +++- .../scale/service/ICounselorService.java | 8 ++++++++ .../scale/service/IReservationService.java | 2 +- .../service/impl/CounselorServiceImpl.java | 11 +++++++++++ .../service/impl/ReservationServiceImpl.java | 4 ++-- .../mapper/scale/ReservationDayMapper.xml | 17 +++++++++++++++-- 10 files changed, 66 insertions(+), 7 deletions(-) diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java index 7b179ad..eceff2c 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java @@ -53,6 +53,17 @@ public class WxCounselorController extends BaseController { return R.ok(counselorService.queryById(userId)); } + /** + * 修改咨询师信息 + */ + @Log(title = "修改咨询师信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R editInfo(@RequestBody CounselorBo bo) { + return toAjax(counselorService.updateInfo(bo)); + } + + /** * 新增预约 */ @@ -72,7 +83,7 @@ public class WxCounselorController extends BaseController { @GetMapping("/reservation/date") public R> getReservationList(String time) { Long userId = LoginHelper.getUserId(); - return R.ok(reservationService.selectDateList(time, userId)); + return R.ok(reservationService.selectUseDateList(time, userId)); } /** diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorBo.java index f605c62..5e435d8 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorBo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorBo.java @@ -91,5 +91,15 @@ public class CounselorBo extends BaseEntity { */ private String countyCode; + /** + * 家庭住址 + */ + private String address; + + /** + * 用户性别 + */ + private String sex; + } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationDateVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationDateVo.java index ae6ae30..f3039ce 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationDateVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationDateVo.java @@ -22,5 +22,7 @@ public class ReservationDateVo implements Serializable { private String dayTime; + private Integer useNum; + private Integer notUseNum; } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderVo.java index 448842c..5e6c047 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderVo.java @@ -18,6 +18,8 @@ public class ReservationOrderVo implements Serializable { @Serial private static final long serialVersionUID = 1L; + private Long timeId; + private String name; private String startTime; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationDayMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationDayMapper.java index 84f1a9b..5b37624 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationDayMapper.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationDayMapper.java @@ -19,7 +19,9 @@ import java.util.List; @Mapper public interface ReservationDayMapper extends BaseMapperPlus { - List selectDateList(@Param("time") String time, @Param("userId") Long userId); + List selectUseDateList(@Param("time") String time, @Param("userId") Long userId); + + List selectNotUseDateList(@Param("time") String time, @Param("userId") Long userId); List selectOrderList(@Param("time") String time, @Param("userId") Long userId); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ICounselorService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ICounselorService.java index c925c8c..c3aec8f 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ICounselorService.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ICounselorService.java @@ -71,6 +71,14 @@ public interface ICounselorService { */ Boolean updatePrive(CounselorBo bo); + /** + * 修改咨询师信息 + * + * @param bo 心理咨询师 + * @return 是否修改成功 + */ + Boolean updateInfo(CounselorBo bo); + /** * 校验并批量删除心理咨询师信息 * diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationService.java index bdd5ab9..66b7c44 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationService.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationService.java @@ -16,7 +16,7 @@ public interface IReservationService { */ Boolean insertByBo(ReservationDayBo bo); - List selectDateList(String time, Long counselorId); + List selectUseDateList(String time, Long counselorId); List selectOrderList(String time, Long counselorId); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorServiceImpl.java index b0c20f0..539dcd4 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorServiceImpl.java @@ -147,6 +147,17 @@ public class CounselorServiceImpl implements ICounselorService { return baseMapper.updateById(update) > 0; } + @Override + public Boolean updateInfo(CounselorBo bo) { + Long userId = LoginHelper.getUserId(); + String name = bo.getName(); + + Counselor update = new Counselor(); + update.setId(userId); + //update.setPrice(price); + return null; + } + /** * 保存前的数据校验 */ diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java index 975c885..2987899 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java @@ -72,8 +72,8 @@ public class ReservationServiceImpl implements IReservationService { } @Override - public List selectDateList(String time, Long counselorId) { - return dayMapper.selectDateList(time, counselorId); + public List selectUseDateList(String time, Long counselorId) { + return dayMapper.selectUseDateList(time, counselorId); } @Override diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml index 736b9c8..a6053a6 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml @@ -3,8 +3,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + select rd.id as dayId, DATE_FORMAT(rd.day_time, '%Y-%m-%d') as dayTime, ifnull(t.num, 0) as useNum from m_reservation_day rd left join (select count(*) as num, day_id from m_reservation_time @@ -15,8 +15,21 @@ and DATE_FORMAT(rd.day_time, '%Y-%m') = #{time} + +