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-19 16:22:07 +08:00
parent 6154447d6d
commit 5e77d13b56
7 changed files with 93 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java
View File

@ -2,7 +2,12 @@ package org.dromara.scale.controller.wx;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.scale.domain.bo.SysScaleBo;
import org.dromara.scale.domain.vo.SysEvaluationRecordVo;
import org.dromara.scale.domain.vo.SysScaleVo;
import org.dromara.scale.service.IMyService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@ -32,13 +37,30 @@ public class WxMyController extends BaseController {
public R<Integer> getEvaluationTaskNum() {
return R.ok(myService.getMyEvaluationTaskNum());
}
/**
* 获取测评任务
* 查询测评任务
*/
@GetMapping("/evaluation/task/pageList")
public TableDataInfo<SysEvaluationRecordVo> list(PageQuery pageQuery) {
return myService.queryEvaluationRecordPageList(pageQuery);
}
/**
* 获取我的量表数量
*
*/
@GetMapping("/evaluation/task")
public R<Integer> getInfo() {
return R.ok(myService.getMyEvaluationTaskNum());
@GetMapping("/scale/num")
public R<Integer> getScaleNum() {
return R.ok(myService.getScaleNum());
}
/**
* 查询我的量表
*/
@GetMapping("/scale/pageList")
public TableDataInfo<SysScaleVo> list(SysScaleBo bo, PageQuery pageQuery) {
return myService.queryScalePageList(bo, pageQuery);
}

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

@ -1,5 +1,6 @@
package org.dromara.scale.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
@ -41,6 +42,7 @@ public class ReservationDayBo extends BaseEntity {
* 日期
*/
@NotNull(message = "日期不能为空", groups = {AddGroup.class, EditGroup.class})
@JsonFormat(pattern = "yyyy-MM-dd")
private Date dayTime;
/**

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

@ -1,15 +1,16 @@
package org.dromara.scale.domain.bo;
import org.dromara.scale.domain.ReservationTime;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.scale.domain.ReservationTime;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 预约-时间业务对象 m_reservation_time
@ -23,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class ReservationTimeBo extends BaseEntity {
/**
*
*
*/
@NotNull(message = "不能为空", groups = { EditGroup.class })
private Long id;
@ -44,12 +45,14 @@ public class ReservationTimeBo extends BaseEntity {
* 开始时间
*/
@NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/**
* 结束时间
*/
@NotNull(message = "结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java
View File

@ -44,4 +44,6 @@ public interface SysEvaluationRecordMapper extends BaseMapperPlus<SysEvaluationR
int selectUndoneNumByBatchNoAndUserId(@Param("batchNo") Long batchNo,@Param("userId") Long userId);
List<String> selectEvaluationScaleList(@Param("userId") Long userId);
}

12
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IMyService.java
View File

@ -1,6 +1,18 @@
package org.dromara.scale.service;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.scale.domain.bo.SysScaleBo;
import org.dromara.scale.domain.vo.SysEvaluationRecordVo;
import org.dromara.scale.domain.vo.SysScaleVo;
public interface IMyService {
Integer getMyEvaluationTaskNum();
TableDataInfo<SysEvaluationRecordVo> queryEvaluationRecordPageList(PageQuery pageQuery);
Integer getScaleNum();
TableDataInfo<SysScaleVo> queryScalePageList(SysScaleBo bo, PageQuery pageQuery);
}

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

@ -1,15 +1,25 @@
package org.dromara.scale.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.scale.constant.StatusEnum;
import org.dromara.scale.domain.SysEvaluationRecord;
import org.dromara.scale.domain.SysScale;
import org.dromara.scale.domain.bo.SysScaleBo;
import org.dromara.scale.domain.vo.SysEvaluationRecordVo;
import org.dromara.scale.domain.vo.SysScaleVo;
import org.dromara.scale.mapper.SysEvaluationRecordMapper;
import org.dromara.scale.mapper.SysScaleMapper;
import org.dromara.scale.service.IMyService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>TODO<p>
*
@ -24,6 +34,8 @@ public class MyServiceImpl implements IMyService {
private final SysEvaluationRecordMapper evaluationRecordMapper;
private final SysScaleMapper scaleMapper;
@Override
public Integer getMyEvaluationTaskNum() {
@ -33,4 +45,26 @@ public class MyServiceImpl implements IMyService {
.le(SysEvaluationRecord::getStatus, StatusEnum.DISABLED.getValue()));
return l.intValue();
}
@Override
public TableDataInfo<SysEvaluationRecordVo> queryEvaluationRecordPageList(PageQuery pageQuery) {
//todo
return null;
}
@Override
public Integer getScaleNum() {
Long userId = LoginHelper.getUserId();
List<String> list = evaluationRecordMapper.selectEvaluationScaleList(userId);
return list.size();
}
@Override
public TableDataInfo<SysScaleVo> queryScalePageList(SysScaleBo bo, PageQuery pageQuery) {
Long userId = LoginHelper.getUserId();
List<String> list = evaluationRecordMapper.selectEvaluationScaleList(userId);
IPage<SysScaleVo> page = scaleMapper.selectVoPage(pageQuery.build(),
new LambdaQueryWrapper<SysScale>().in(SysScale::getScaleId, list));
return TableDataInfo.build(page);
}
}

7
ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationRecordMapper.xml
View File

@ -101,4 +101,11 @@
and user_id = #{userId}
and status = -1
</select>
<select id="selectEvaluationScaleList" resultType="java.lang.String">
select scale_id
from sys_evaluation_record
where user_id = #{userId}
group by scale_id
</select>
</mapper>