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 391677c..e81d13d 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 @@ -1,6 +1,5 @@ package org.dromara.scale.controller.wx; -import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; @@ -46,14 +45,12 @@ public class WxCounselorController extends BaseController { private final ICounselorExperienceService experienceService; - /** * 查询心理咨询师列表 */ - @SaCheckPermission("sys:counselor:list") - @GetMapping("/list") - public TableDataInfo list(CounselorBo bo, PageQuery pageQuery) { - return counselorService.queryPageList(bo, pageQuery); + @GetMapping("/pageList") + public TableDataInfo list(QueryCounselorBo bo, PageQuery pageQuery) { + return counselorService.queryPageList4Wx(bo, pageQuery); } /** diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorVo.java index 83358ff..a86ed2c 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorVo.java @@ -62,7 +62,6 @@ public class CounselorVo implements Serializable { /** * 封面组 */ - private String covers; @Translation(type = TransConstant.OSS_ID_TO_URL) @@ -116,5 +115,11 @@ public class CounselorVo implements Serializable { */ private String goodRate; + @Translation(type = TransConstant.OSS_ID_TO_URL) + private Long avatarUrl; + /** + * 咨询数量 + */ + private Integer reservationNum; } 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 c3ef18e..26fb053 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 @@ -117,7 +117,15 @@ public class CounselorServiceImpl implements ICounselorService { @Override public TableDataInfo queryPageList4Wx(QueryCounselorBo bo, PageQuery pageQuery) { - return null; + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + List records = result.getRecords(); + for (CounselorVo one : records) { + SysUserVo user = userService.selectUserById(one.getId()); + one.setAvatarUrl(user.getAvatar()); + one.setReservationNum(100); + } + return TableDataInfo.build(result); } /**