From ab9346537901418d4cabd62fa5a9bff490f886be Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 03 一月 2025 02:19:12 +0800
Subject: [PATCH] 1.大屏接口 2.bug修改
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java
index 952eecf..cda9e1c 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java
@@ -1,6 +1,7 @@
package com.sinata.system.service.impl;
import cn.idev.excel.util.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sinata.common.core.domain.entity.SysDictData;
@@ -8,6 +9,7 @@
import com.sinata.common.entity.PageDTO;
import com.sinata.common.exception.ServiceException;
import com.sinata.common.utils.BeanUtils;
+import com.sinata.common.utils.CollUtils;
import com.sinata.common.utils.DictUtils;
import com.sinata.system.domain.dto.SysDictDataDTO;
import com.sinata.system.domain.query.KeyWordQuery;
@@ -21,6 +23,7 @@
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 字典 业务层处理
@@ -128,6 +131,17 @@
@Override
public PageDTO<SysDictDataVO> pageList(KeyWordQuery query) {
Page<SysDictData> result = this.lambdaQuery().like(StringUtils.isNotBlank(query.getKeyword()), SysDictData::getDictLabel, query.getKeyword()).page(new Page<>(query.getPageCurr(), query.getPageSize()));
+ List<String> dictTypeList = result.getRecords().stream().map(SysDictData::getDictType).distinct().collect(Collectors.toList());
+ if (CollUtils.isNotEmpty(dictTypeList)) {
+ List<SysDictType> sysDictTypes = dictTypeMapper.selectList(new LambdaQueryWrapper<SysDictType>().in(SysDictType::getDictType, dictTypeList));
+ result.getRecords().forEach(sysDictData -> {
+ sysDictTypes.forEach(sysDictType -> {
+ if (sysDictType.getDictType().equals(sysDictData.getDictType())) {
+ sysDictData.setDictType(sysDictType.getDictName());
+ }
+ });
+ });
+ }
return PageDTO.of(result, SysDictDataVO.class);
}
--
Gitblit v1.7.1