From 7d83a1516ec2df76957e87533d3b9f26a6ca2964 Mon Sep 17 00:00:00 2001 From: cjw Date: Sat, 24 Aug 2024 15:28:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2=E4=B8=B0?= =?UTF-8?q?=E5=AF=8C=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReservationOrderController.java | 10 ++-- .../scale/controller/wx/WxMyController.java | 33 ++++++------ .../scale/domain/vo/StatisticNumVo.java | 7 +++ .../domain/vo/SysEvaluationRecordVo.java | 8 +-- .../dromara/scale/mapper/ActivityMapper.java | 2 +- .../scale/mapper/ReservationOrderMapper.java | 4 +- .../org/dromara/scale/service/IMyService.java | 11 ++-- .../service/IReservationOrderService.java | 8 +-- .../service/impl/ActivityServiceImpl.java | 7 +-- .../scale/service/impl/MyServiceImpl.java | 50 +++++++++++++++---- .../impl/ReservationOrderServiceImpl.java | 10 ++-- .../resources/mapper/scale/ActivityMapper.xml | 10 ++-- 12 files changed, 104 insertions(+), 56 deletions(-) diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ReservationOrderController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ReservationOrderController.java index fd31386..f0eca14 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ReservationOrderController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ReservationOrderController.java @@ -12,7 +12,7 @@ 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.ReservationOrderBo; -import org.dromara.scale.domain.vo.ReservationCounselorOrderVo; +import org.dromara.scale.domain.vo.ReservationOrderVo; import org.dromara.scale.service.IReservationOrderService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -38,7 +38,7 @@ public class ReservationOrderController extends BaseController { */ @SaCheckPermission("scale:reservationOrder:list") @GetMapping("/list") - public TableDataInfo list(ReservationOrderBo bo, PageQuery pageQuery) { + public TableDataInfo list(ReservationOrderBo bo, PageQuery pageQuery) { return reservationOrderService.queryPageList(bo, pageQuery); } @@ -49,8 +49,8 @@ public class ReservationOrderController extends BaseController { @Log(title = "预约订单", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(ReservationOrderBo bo, HttpServletResponse response) { - List list = reservationOrderService.queryList(bo); - ExcelUtil.exportExcel(list, "预约订单", ReservationCounselorOrderVo.class, response); + List list = reservationOrderService.queryList(bo); + ExcelUtil.exportExcel(list, "预约订单", ReservationOrderVo.class, response); } /** @@ -60,7 +60,7 @@ public class ReservationOrderController extends BaseController { */ @SaCheckPermission("scale:reservationOrder:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(reservationOrderService.queryById(id)); } 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 349c629..9d2c2ed 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 @@ -5,7 +5,10 @@ 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.ReservationOrderBo; import org.dromara.scale.domain.bo.SysScaleBo; +import org.dromara.scale.domain.vo.ReservationOrderVo; +import org.dromara.scale.domain.vo.StatisticNumVo; import org.dromara.scale.domain.vo.SysEvaluationRecordVo; import org.dromara.scale.domain.vo.SysScaleVo; import org.dromara.scale.service.IMyService; @@ -14,6 +17,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** *

TODO

* @@ -30,31 +35,21 @@ public class WxMyController extends BaseController { private final IMyService myService; /** - * 获取测评任务数量 - * + * 获取各数量数量 */ - @GetMapping("/evaluation/task/num") - public R getEvaluationTaskNum() { - return R.ok(myService.getMyEvaluationTaskNum()); + @GetMapping("/num") + public R> getEvaluationTaskNum() { + return R.ok(myService.getMyNum()); } /** - * 查询测评任务 + * 查询我的测评任务 */ @GetMapping("/evaluation/task/pageList") public TableDataInfo list(PageQuery pageQuery) { return myService.queryEvaluationRecordPageList(pageQuery); } - /** - * 获取我的量表数量 - * - */ - @GetMapping("/scale/num") - public R getScaleNum() { - return R.ok(myService.getScaleNum()); - } - /** * 查询我的量表 */ @@ -63,5 +58,13 @@ public class WxMyController extends BaseController { return myService.queryScalePageList(bo, pageQuery); } + /** + * 查询我的干预与诊断 + */ + @GetMapping("/intervene/pageList") + public TableDataInfo list(ReservationOrderBo bo, PageQuery pageQuery) { + return myService.queryReservationPageList(bo, pageQuery); + } + } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/StatisticNumVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/StatisticNumVo.java index 52133e7..72d30e6 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/StatisticNumVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/StatisticNumVo.java @@ -30,4 +30,11 @@ public class StatisticNumVo implements Serializable { @JsonIgnore private String parentName; + public StatisticNumVo() { + } + + public StatisticNumVo(String name, int value) { + this.value = value; + this.name = name; + } } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationRecordVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationRecordVo.java index b555464..b012828 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationRecordVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysEvaluationRecordVo.java @@ -8,7 +8,7 @@ import org.dromara.scale.domain.SysEvaluationRecord; import java.io.Serial; import java.io.Serializable; - +import java.util.Date; /** @@ -39,6 +39,8 @@ public class SysEvaluationRecordVo implements Serializable { private String scaleName; + private String appCoverUrl; + /** * 测评人id */ @@ -61,9 +63,7 @@ public class SysEvaluationRecordVo implements Serializable { */ private Integer status; - - - + private Date createTime; } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ActivityMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ActivityMapper.java index 5a067a9..295acde 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ActivityMapper.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ActivityMapper.java @@ -11,5 +11,5 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @date 2024-08-19 */ public interface ActivityMapper extends BaseMapperPlus { - + int addViewNum(Long id); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationOrderMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationOrderMapper.java index dd34324..42e3c74 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationOrderMapper.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationOrderMapper.java @@ -3,7 +3,7 @@ package org.dromara.scale.mapper; import org.apache.ibatis.annotations.Mapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.scale.domain.ReservationOrder; -import org.dromara.scale.domain.vo.ReservationCounselorOrderVo; +import org.dromara.scale.domain.vo.ReservationOrderVo; /** * 预约订单Mapper接口 @@ -12,6 +12,6 @@ import org.dromara.scale.domain.vo.ReservationCounselorOrderVo; * @date 2024-08-22 */ @Mapper -public interface ReservationOrderMapper extends BaseMapperPlus { +public interface ReservationOrderMapper extends BaseMapperPlus { } 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 3721528..139ac4b 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 @@ -2,17 +2,22 @@ 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.ReservationOrderBo; import org.dromara.scale.domain.bo.SysScaleBo; +import org.dromara.scale.domain.vo.ReservationOrderVo; +import org.dromara.scale.domain.vo.StatisticNumVo; import org.dromara.scale.domain.vo.SysEvaluationRecordVo; import org.dromara.scale.domain.vo.SysScaleVo; +import java.util.List; + public interface IMyService { - Integer getMyEvaluationTaskNum(); + List getMyNum(); TableDataInfo queryEvaluationRecordPageList(PageQuery pageQuery); - Integer getScaleNum(); - TableDataInfo queryScalePageList(SysScaleBo bo, PageQuery pageQuery); + + TableDataInfo queryReservationPageList(ReservationOrderBo bo, PageQuery pageQuery); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationOrderService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationOrderService.java index e7ac15b..7311e7f 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationOrderService.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationOrderService.java @@ -3,7 +3,7 @@ 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.ReservationOrderBo; -import org.dromara.scale.domain.vo.ReservationCounselorOrderVo; +import org.dromara.scale.domain.vo.ReservationOrderVo; import java.util.List; @@ -21,7 +21,7 @@ public interface IReservationOrderService { * @param id 主键 * @return 预约订单 */ - ReservationCounselorOrderVo queryById(Long id); + ReservationOrderVo queryById(Long id); /** * 分页查询预约订单列表 @@ -30,7 +30,7 @@ public interface IReservationOrderService { * @param pageQuery 分页参数 * @return 预约订单分页列表 */ - TableDataInfo queryPageList(ReservationOrderBo bo, PageQuery pageQuery); + TableDataInfo queryPageList(ReservationOrderBo bo, PageQuery pageQuery); /** * 查询符合条件的预约订单列表 @@ -38,7 +38,7 @@ public interface IReservationOrderService { * @param bo 查询条件 * @return 预约订单列表 */ - List queryList(ReservationOrderBo bo); + List queryList(ReservationOrderBo bo); /** * 新增预约订单 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ActivityServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ActivityServiceImpl.java index cd1a267..c3bad28 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ActivityServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ActivityServiceImpl.java @@ -38,7 +38,8 @@ public class ActivityServiceImpl implements IActivityService { * @return 活动 */ @Override - public ActivityVo queryById(Long id){ + public ActivityVo queryById(Long id) { + baseMapper.addViewNum(id); return baseMapper.selectVoById(id); } @@ -112,7 +113,7 @@ public class ActivityServiceImpl implements IActivityService { /** * 保存前的数据校验 */ - private void validEntityBeforeSave(Activity entity){ + private void validEntityBeforeSave(Activity entity) { //TODO 做一些数据校验,如唯一约束 } @@ -125,7 +126,7 @@ public class ActivityServiceImpl implements IActivityService { */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } return baseMapper.deleteByIds(ids) > 0; 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 5577dfa..354f5e0 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 @@ -6,20 +6,27 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.service.OssService; 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.ReservationOrder; import org.dromara.scale.domain.SysEvaluationRecord; import org.dromara.scale.domain.SysScale; +import org.dromara.scale.domain.bo.ReservationOrderBo; import org.dromara.scale.domain.bo.SysScaleBo; +import org.dromara.scale.domain.vo.ReservationOrderVo; +import org.dromara.scale.domain.vo.StatisticNumVo; import org.dromara.scale.domain.vo.SysEvaluationRecordVo; import org.dromara.scale.domain.vo.SysScaleVo; +import org.dromara.scale.mapper.ReservationOrderMapper; 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.ArrayList; import java.util.List; /** @@ -35,17 +42,31 @@ import java.util.List; public class MyServiceImpl implements IMyService { private final SysEvaluationRecordMapper evaluationRecordMapper; - private final SysScaleMapper scaleMapper; + private final ReservationOrderMapper reservationOrderMapper; + + private final OssService ossService; @Override - public Integer getMyEvaluationTaskNum() { + public List getMyNum() { + List list = new ArrayList<>(); Long userId = LoginHelper.getUserId(); - Long l = evaluationRecordMapper.selectCount(new LambdaQueryWrapper() + + Long recoreNum = evaluationRecordMapper.selectCount(new LambdaQueryWrapper() .eq(SysEvaluationRecord::getUserId, userId) + .eq(SysEvaluationRecord::getPublishFlag, 0) .le(SysEvaluationRecord::getStatus, StatusEnum.DISABLED.getValue())); - return l.intValue(); + list.add(new StatisticNumVo("evaluation", recoreNum.intValue())); + + List scaleList = evaluationRecordMapper.selectEvaluationScaleList(userId); + list.add(new StatisticNumVo("scale", scaleList.size())); + + Long ordernum = reservationOrderMapper.selectCount(new LambdaQueryWrapper() + .eq(ReservationOrder::getCreateBy, userId) + .eq(ReservationOrder::getOrderStatus, 2)); + list.add(new StatisticNumVo("intervene", ordernum.intValue())); + return list; } @Override @@ -55,16 +76,15 @@ public class MyServiceImpl implements IMyService { lqw.eq(SysEvaluationRecord::getUserId, userId); lqw.orderByDesc(SysEvaluationRecord::getCreateTime); Page result = evaluationRecordMapper.selectRecordVoPage(pageQuery.build(), lqw); + List records = result.getRecords(); + for (SysEvaluationRecordVo record : records) { + SysScale scale = scaleMapper.selectById(record.getScaleId()); + String s = ossService.selectUrlByIds(String.valueOf(scale.getAppCover())); + record.setAppCoverUrl(s); + } return TableDataInfo.build(result); } - @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(); @@ -73,4 +93,12 @@ public class MyServiceImpl implements IMyService { new LambdaQueryWrapper().in(SysScale::getScaleId, list)); return TableDataInfo.build(page); } + + @Override + public TableDataInfo queryReservationPageList(ReservationOrderBo bo, PageQuery pageQuery) { + Long userId = LoginHelper.getUserId(); + IPage page = reservationOrderMapper.selectVoPage(pageQuery.build(), + new LambdaQueryWrapper().eq(ReservationOrder::getCreateBy, userId)); + return TableDataInfo.build(page); + } } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationOrderServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationOrderServiceImpl.java index 04774cd..d2f2702 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationOrderServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationOrderServiceImpl.java @@ -15,7 +15,7 @@ import org.dromara.scale.domain.Counselor; import org.dromara.scale.domain.ReservationOrder; import org.dromara.scale.domain.ReservationTime; import org.dromara.scale.domain.bo.ReservationOrderBo; -import org.dromara.scale.domain.vo.ReservationCounselorOrderVo; +import org.dromara.scale.domain.vo.ReservationOrderVo; import org.dromara.scale.mapper.CounselorMapper; import org.dromara.scale.mapper.ReservationOrderMapper; import org.dromara.scale.mapper.ReservationTimeMapper; @@ -48,7 +48,7 @@ public class ReservationOrderServiceImpl implements IReservationOrderService { * @return 预约订单 */ @Override - public ReservationCounselorOrderVo queryById(Long id) { + public ReservationOrderVo queryById(Long id) { return baseMapper.selectVoById(id); } @@ -60,9 +60,9 @@ public class ReservationOrderServiceImpl implements IReservationOrderService { * @return 预约订单分页列表 */ @Override - public TableDataInfo queryPageList(ReservationOrderBo bo, PageQuery pageQuery) { + public TableDataInfo queryPageList(ReservationOrderBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -73,7 +73,7 @@ public class ReservationOrderServiceImpl implements IReservationOrderService { * @return 预约订单列表 */ @Override - public List queryList(ReservationOrderBo bo) { + public List queryList(ReservationOrderBo bo) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ActivityMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ActivityMapper.xml index f718ac9..aa2d4b7 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ActivityMapper.xml +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ActivityMapper.xml @@ -1,7 +1,11 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + + update m_activity + set view_nums = view_nums + 1 + where id = #{id} +