mozhe
/
mental-tenant-api
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
cjw 2024-08-23 16:38:45 +08:00
parent a25a6ebd1f
commit 28335462b2
4 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/Counselor.java
View File

@ -49,6 +49,7 @@ public class Counselor extends BaseEntity {
* 个人简介
*/
private String introduce;
private String introduce_title;
/**
* 擅长领域
@ -76,14 +77,17 @@ public class Counselor extends BaseEntity {
* 省
*/
private String provinceCode;
private String provinceName;
/**
* 市
*/
private String cityCode;
private String cityName;
/**
* 区
*/
private String countyCode;
private String countyName;
}

22
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/CounselorBo.java
View File

@ -9,6 +9,7 @@ import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@ -27,32 +28,34 @@ public class CounselorBo extends BaseEntity {
/**
*
*/
@NotNull(message = "不能为空", groups = { EditGroup.class })
@NotNull(message = "不能为空", groups = {EditGroup.class})
private Long id;
/**
* 姓名
*/
@NotBlank(message = "姓名不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "姓名不能为空", groups = {AddGroup.class, EditGroup.class})
private String name;
/**
* 手机号码
*/
@NotBlank(message = "手机号码不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "手机号码不能为空", groups = {AddGroup.class, EditGroup.class})
private String phonenumber;
/**
* 价格
*/
@NotNull(message = "价格不能为空", groups = { AddGroup.class, EditGroup.class })
@NotNull(message = "价格不能为空", groups = {AddGroup.class, EditGroup.class})
private BigDecimal price;
/**
* 个人简介
*/
@NotBlank(message = "个人简介不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "个人简介不能为空", groups = {AddGroup.class, EditGroup.class})
private String introduce;
@NotBlank(message = "简介标题不能为空", groups = {AddGroup.class, EditGroup.class})
private String introduceTitle;
/**
* 擅长领域
@ -63,33 +66,36 @@ public class CounselorBo extends BaseEntity {
/**
* 封面组
*/
@NotBlank(message = "封面组不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "封面组不能为空", groups = {AddGroup.class, EditGroup.class})
private String covers;
/**
* 服务时长
*/
@NotNull(message = "服务时长不能为空", groups = { AddGroup.class, EditGroup.class })
@NotNull(message = "服务时长不能为空", groups = {AddGroup.class, EditGroup.class})
private Integer serviceDuration;
/**
* 从业时间
*/
@NotNull(message = "从业时间不能为空", groups = { AddGroup.class, EditGroup.class })
@NotNull(message = "从业时间不能为空", groups = {AddGroup.class, EditGroup.class})
private Date practiceTime;
/**
* 省
*/
private String provinceCode;
private String provinceName;
/**
* 市
*/
private String cityCode;
private String cityName;
/**
* 区
*/
private String countyCode;
private String countyName;
/**
* 家庭住址

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorVo.java
View File

@ -58,6 +58,7 @@ public class CounselorVo implements Serializable {
*/
@AutoMapping(ignore = true)
private List<String> specialityField;
private List<String> specialityFieldName;
/**
* 封面组
@ -81,14 +82,17 @@ public class CounselorVo implements Serializable {
* 省
*/
private String provinceCode;
private String provinceName;
/**
* 市
*/
private String cityCode;
private String cityName;
/**
* 区
*/
private String countyCode;
private String countyName;
/**
* 家庭住址

13
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorServiceImpl.java
View File

@ -1,11 +1,13 @@
package org.dromara.scale.service.impl;
import cn.dev33.satoken.secure.BCrypt;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.service.DictService;
import org.dromara.common.core.utils.DateUtils;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
@ -44,12 +46,12 @@ import java.util.Map;
public class CounselorServiceImpl implements ICounselorService {
private final CounselorMapper baseMapper;
private final CounselorExperienceMapper experienceMapper;
private final ScoreRecordMapper scoreRecordMapper;
private final DictService dictService;
private final ISysUserService userService;
private final CounselorExperienceMapper experienceMapper;
private final ScoreRecordMapper scoreRecordMapper;
/**
* 查询心理咨询师
@ -124,6 +126,11 @@ public class CounselorServiceImpl implements ICounselorService {
SysUserVo user = userService.selectUserById(one.getId());
one.setAvatarUrl(user.getAvatar());
one.setReservationNum(100);
Date practiceTime = one.getPracticeTime();
String betweenYear = DateUtils.getBetweenYear(practiceTime, new Date());
one.setPracticeString(betweenYear);
String scaleTypeName = dictService.getDictLabel("good_field", StrUtil.join(StrUtil.COMMA, one.getSpecialityField()));
one.setSpecialityFieldName(StrUtil.split(scaleTypeName, StrUtil.COMMA));
}
return TableDataInfo.build(result);
}