From 5e77d13b56a96fa9d3c68005600fb3830a237b1e Mon Sep 17 00:00:00 2001 From: cjw Date: Mon, 19 Aug 2024 16:22:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=91=E7=9A=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=9B=E5=85=B6=E4=BB=96=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scale/controller/wx/WxMyController.java | 30 +++++++++++++--- .../scale/domain/bo/ReservationDayBo.java | 2 ++ .../scale/domain/bo/ReservationTimeBo.java | 17 ++++++---- .../mapper/SysEvaluationRecordMapper.java | 2 ++ .../org/dromara/scale/service/IMyService.java | 12 +++++++ .../scale/service/impl/MyServiceImpl.java | 34 +++++++++++++++++++ .../scale/SysEvaluationRecordMapper.xml | 7 ++++ 7 files changed, 93 insertions(+), 11 deletions(-) diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java index 3f76635..349c629 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java @@ -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 getEvaluationTaskNum() { return R.ok(myService.getMyEvaluationTaskNum()); } + /** - * 获取测评任务 + * 查询测评任务 + */ + @GetMapping("/evaluation/task/pageList") + public TableDataInfo list(PageQuery pageQuery) { + return myService.queryEvaluationRecordPageList(pageQuery); + } + + /** + * 获取我的量表数量 * */ - @GetMapping("/evaluation/task") - public R getInfo() { - return R.ok(myService.getMyEvaluationTaskNum()); + @GetMapping("/scale/num") + public R getScaleNum() { + return R.ok(myService.getScaleNum()); + } + + /** + * 查询我的量表 + */ + @GetMapping("/scale/pageList") + public TableDataInfo list(SysScaleBo bo, PageQuery pageQuery) { + return myService.queryScalePageList(bo, pageQuery); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationDayBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationDayBo.java index e0f7d8c..b3bf866 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationDayBo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationDayBo.java @@ -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; /** diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationTimeBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationTimeBo.java index 34f100a..b81ce4f 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationTimeBo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationTimeBo.java @@ -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; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java index d36d6fc..e7d3125 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java @@ -44,4 +44,6 @@ public interface SysEvaluationRecordMapper extends BaseMapperPlus selectEvaluationScaleList(@Param("userId") Long userId); + } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IMyService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IMyService.java index 7d9eca2..3721528 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IMyService.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IMyService.java @@ -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 queryEvaluationRecordPageList(PageQuery pageQuery); + + Integer getScaleNum(); + + TableDataInfo queryScalePageList(SysScaleBo bo, PageQuery pageQuery); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/MyServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/MyServiceImpl.java index 034a401..ef6bb82 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/MyServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/MyServiceImpl.java @@ -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; + /** *

TODO

* @@ -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 queryEvaluationRecordPageList(PageQuery pageQuery) { + //todo + return null; + } + + @Override + public Integer getScaleNum() { + Long userId = LoginHelper.getUserId(); + List list = evaluationRecordMapper.selectEvaluationScaleList(userId); + return list.size(); + } + + @Override + public TableDataInfo queryScalePageList(SysScaleBo bo, PageQuery pageQuery) { + Long userId = LoginHelper.getUserId(); + List list = evaluationRecordMapper.selectEvaluationScaleList(userId); + IPage page = scaleMapper.selectVoPage(pageQuery.build(), + new LambdaQueryWrapper().in(SysScale::getScaleId, list)); + return TableDataInfo.build(page); + } } diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationRecordMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationRecordMapper.xml index 5d1a725..c9a44dc 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationRecordMapper.xml +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationRecordMapper.xml @@ -101,4 +101,11 @@ and user_id = #{userId} and status = -1 + +