From b9da0c7d40537ec701c619404a6374205894eb2d Mon Sep 17 00:00:00 2001 From: cjw Date: Tue, 30 Jul 2024 16:49:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=9F=E6=88=B7=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=9B=E4=BC=98=E5=8C=96=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 8 ++++++ .../controller/wx/WxScaleController.java | 12 ++++++--- .../dromara/scale/domain/bo/SysScaleBo.java | 2 ++ .../scale/service/ISysScaleService.java | 3 ++- .../service/impl/SysScaleServiceImpl.java | 27 ++++++++++++------- 5 files changed, 38 insertions(+), 14 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 27de286..6dd5d6d 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -140,6 +140,14 @@ tenant: - sys_user_role - sys_client - sys_oss_config + - sys_oss + - m_counselor + - m_counselor_experience + - m_counselor_qualification + - m_reservation_day + - m_reservation_order + - m_reservation_time + - m_score_record # MyBatisPlus配置 # https://baomidou.com/config/ diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScaleController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScaleController.java index c14f8e3..f9c9855 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScaleController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxScaleController.java @@ -1,9 +1,10 @@ package org.dromara.scale.controller.wx; -import jakarta.validation.constraints.NotBlank; +import cn.hutool.core.util.ObjectUtil; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; +import org.dromara.common.core.exception.ServiceException; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; +import java.util.Map; /** *

TODO

@@ -38,6 +40,7 @@ public class WxScaleController extends BaseController { */ @GetMapping("/pageList") public TableDataInfo pageList(SysScaleBo bo, PageQuery pageQuery) { + bo.setOrderBy("num"); return sysScaleService.queryPageList(bo, pageQuery); } @@ -45,8 +48,11 @@ public class WxScaleController extends BaseController { * 查询心理测评量列表,默认展示两条数据 */ @GetMapping("/list") - public R> list(@NotBlank(message = "类型不能为空") String scaleType) { - return R.ok(sysScaleService.queryWxList(scaleType)); + public R>> list(String[] scaleType) { + if (ObjectUtil.isEmpty(scaleType)) { + throw new ServiceException("类型不能为空"); + } + return R.ok(sysScaleService.queryWxMapList(scaleType)); } /** diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleBo.java index 74373c3..6ab21b2 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleBo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScaleBo.java @@ -122,4 +122,6 @@ public class SysScaleBo extends BaseEntity { private Integer freeFlag; private BigDecimal price; + + private String orderBy; } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleService.java index 7f2e7c0..222d7e2 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleService.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleService.java @@ -7,6 +7,7 @@ import org.dromara.scale.domain.vo.SysScaleVo; import java.util.Collection; import java.util.List; +import java.util.Map; /** * 心理测评量Service接口 @@ -46,5 +47,5 @@ public interface ISysScaleService { */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); - List queryWxList(String scaleType); + Map> queryWxMapList(String[] scaleType); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java index 965416a..fcef112 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleServiceImpl.java @@ -24,9 +24,7 @@ import org.dromara.system.mapper.SysOssMapper; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.util.Collection; -import java.util.List; -import java.util.OptionalDouble; +import java.util.*; import java.util.stream.Collectors; /** @@ -69,7 +67,11 @@ public class SysScaleServiceImpl implements ISysScaleService { @Override public TableDataInfo queryPageList(SysScaleBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - lqw.orderByDesc(SysScale::getUpdateTime); + if ("num".equals(bo.getOrderBy())) { + lqw.orderByDesc(SysScale::getPublishNums); + } else { + lqw.orderByDesc(SysScale::getUpdateTime); + } Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); for (SysScaleVo record : result.getRecords()) { List scaleTypeList = sysDictDataMapper.selectDictDataByTypeAndDictValue("scale_type", StrUtil.join(StrUtil.COMMA, record.getScaleType())); @@ -148,11 +150,16 @@ public class SysScaleServiceImpl implements ISysScaleService { } @Override - public List queryWxList(String scaleType) { - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - lqw.like(SysScale::getScaleType, scaleType); - lqw.orderByDesc(SysScale::getPublishNums); - lqw.last("limit 2"); - return baseMapper.selectVoList(lqw); + public Map> queryWxMapList(String[] scaleType) { + Map> map = new HashMap<>(scaleType.length); + for (String s : scaleType) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.like(SysScale::getScaleType, s); + lqw.orderByDesc(SysScale::getPublishNums); + lqw.last("limit 2"); + List list = baseMapper.selectVoList(lqw); + map.put(s, list); + } + return map; } }