From ba8767b725bbb2ced9bb4da6551009d941ffab79 Mon Sep 17 00:00:00 2001 From: cjw Date: Wed, 31 Jul 2024 16:28:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysScaleServiceImpl.java | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) 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 af4b5b6..dc1d414 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 @@ -6,6 +6,7 @@ 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.service.DictService; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; @@ -18,14 +19,10 @@ import org.dromara.scale.domain.vo.SysScaleVo; import org.dromara.scale.mapper.ScoreRecordMapper; import org.dromara.scale.mapper.SysScaleMapper; import org.dromara.scale.service.ISysScaleService; -import org.dromara.system.domain.vo.SysDictDataVo; -import org.dromara.system.mapper.SysDictDataMapper; -import org.dromara.system.mapper.SysOssMapper; import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.util.*; -import java.util.stream.Collectors; /** * 心理测评量Service业务层处理 @@ -37,8 +34,7 @@ import java.util.stream.Collectors; @Service public class SysScaleServiceImpl implements ISysScaleService { private final SysScaleMapper baseMapper; - private final SysDictDataMapper sysDictDataMapper; - private final SysOssMapper sysOssMapper; + private final DictService dictService; private final ScoreRecordMapper scoreMapper; /** @@ -48,11 +44,11 @@ public class SysScaleServiceImpl implements ISysScaleService { public SysScaleVo queryById(Long scaleId) { SysScaleVo sysScaleVo = baseMapper.selectVoById(scaleId); - List scaleTypeList = sysDictDataMapper.selectDictDataByTypeAndDictValue("scale_type", StrUtil.join(StrUtil.COMMA, sysScaleVo.getScaleType())); - sysScaleVo.setScaleTypeName(scaleTypeList.stream().map(SysDictDataVo::getDictLabel).collect(Collectors.toList())); + String scaleTypeName = dictService.getDictLabel("scale_type", StrUtil.join(StrUtil.COMMA, sysScaleVo.getScaleType())); + sysScaleVo.setScaleTypeName(StrUtil.split(scaleTypeName, StrUtil.COMMA)); - List peopleTypeList = sysDictDataMapper.selectDictDataByTypeAndDictValue("people_type", StrUtil.join(StrUtil.COMMA, sysScaleVo.getPeopleType())); - sysScaleVo.setPeopleTypeName(peopleTypeList.stream().map(SysDictDataVo::getDictLabel).collect(Collectors.toList())); + String peopleTypeName = dictService.getDictLabel("people_type", StrUtil.join(StrUtil.COMMA, sysScaleVo.getPeopleType())); + sysScaleVo.setPeopleTypeName(StrUtil.split(peopleTypeName, StrUtil.COMMA)); //计算均分 List scoreList = scoreMapper.selectList(new LambdaQueryWrapper().select(ScoreRecord::getScore).eq(ScoreRecord::getBusinessId, scaleId).eq(ScoreRecord::getRecordStatus, 0)); OptionalDouble averageScore = scoreList.stream() @@ -79,11 +75,11 @@ public class SysScaleServiceImpl implements ISysScaleService { } Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); for (SysScaleVo record : result.getRecords()) { - List scaleTypeList = sysDictDataMapper.selectDictDataByTypeAndDictValue("scale_type", StrUtil.join(StrUtil.COMMA, record.getScaleType())); - record.setScaleTypeName(scaleTypeList.stream().map(SysDictDataVo::getDictLabel).collect(Collectors.toList())); + String scaleTypeName = dictService.getDictLabel("scale_type", StrUtil.join(StrUtil.COMMA, record.getScaleType())); + record.setScaleTypeName(StrUtil.split(scaleTypeName, StrUtil.COMMA)); - List peopleTypeList = sysDictDataMapper.selectDictDataByTypeAndDictValue("people_type", StrUtil.join(StrUtil.COMMA, record.getPeopleType())); - record.setPeopleTypeName(peopleTypeList.stream().map(SysDictDataVo::getDictLabel).collect(Collectors.toList())); + String peopleTypeName = dictService.getDictLabel("people_type", StrUtil.join(StrUtil.COMMA, record.getPeopleType())); + record.setPeopleTypeName(StrUtil.split(peopleTypeName, StrUtil.COMMA)); } return TableDataInfo.build(result); } @@ -98,11 +94,11 @@ public class SysScaleServiceImpl implements ISysScaleService { } List result = baseMapper.selectVoList(lqw); for (SysScaleVo record : result) { - List scaleTypeList = sysDictDataMapper.selectDictDataByTypeAndDictValue("scale_type", StrUtil.join(StrUtil.COMMA, record.getScaleType())); - record.setScaleTypeName(scaleTypeList.stream().map(SysDictDataVo::getDictLabel).collect(Collectors.toList())); + String scaleTypeName = dictService.getDictLabel("scale_type", StrUtil.join(StrUtil.COMMA, record.getScaleType())); + record.setScaleTypeName(StrUtil.split(scaleTypeName, StrUtil.COMMA)); - List peopleTypeList = sysDictDataMapper.selectDictDataByTypeAndDictValue("people_type", StrUtil.join(StrUtil.COMMA, record.getPeopleType())); - record.setPeopleTypeName(peopleTypeList.stream().map(SysDictDataVo::getDictLabel).collect(Collectors.toList())); + String peopleTypeName = dictService.getDictLabel("people_type", StrUtil.join(StrUtil.COMMA, record.getPeopleType())); + record.setPeopleTypeName(StrUtil.split(peopleTypeName, StrUtil.COMMA)); } return result; }