From d89a42213b4a32535e93185dedf41fe7a7fc1940 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 04 四月 2025 01:57:13 +0800
Subject: [PATCH] bug修改
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java | 104 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 93 insertions(+), 11 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 aee4bec..a882131 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,28 +1,33 @@
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;
import com.sinata.common.core.domain.entity.SysDictType;
-import com.sinata.common.entity.BasePage;
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;
import com.sinata.system.domain.vo.SysDictDataVO;
import com.sinata.system.mapper.SysDictDataMapper;
import com.sinata.system.mapper.SysDictTypeMapper;
import com.sinata.system.service.ISysDictDataService;
+import org.jetbrains.annotations.Nullable;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 字典 业务层处理
- *
+ *
* @author ruoyi
*/
@Service
@@ -35,7 +40,7 @@
/**
* 根据条件分页查询字典数据
- *
+ *
* @param dictData 字典数据信息
* @return 字典数据集合信息
*/
@@ -47,7 +52,7 @@
/**
* 根据字典类型和字典键值查询字典数据信息
- *
+ *
* @param dictType 字典类型
* @param dictValue 字典键值
* @return 字典标签
@@ -60,7 +65,7 @@
/**
* 根据字典数据ID查询信息
- *
+ *
* @param dictCode 字典数据ID
* @return 字典数据
*/
@@ -72,7 +77,7 @@
/**
* 批量删除字典数据信息
- *
+ *
* @param dictCodes 需要删除的字典数据ID
*/
@Override
@@ -89,7 +94,7 @@
/**
* 新增保存字典数据信息
- *
+ *
* @param data 字典数据信息
* @return 结果
*/
@@ -107,7 +112,7 @@
/**
* 修改保存字典数据信息
- *
+ *
* @param data 字典数据信息
* @return 结果
*/
@@ -124,9 +129,27 @@
}
@Override
- public PageDTO<SysDictDataVO> pageList(BasePage page) {
- Page<SysDictData> result = this.lambdaQuery().page(new Page<>(page.getPageCurr(), page.getPageSize()));
- return PageDTO.of(result, SysDictDataVO.class);
+ public PageDTO<SysDictDataVO> pageList(KeyWordQuery query) {
+ Page<SysDictData> result = this.lambdaQuery()
+ .like(StringUtils.isNotBlank(query.getKeyword()), SysDictData::getDictLabel, query.getKeyword())
+ .eq(StringUtils.isNotBlank(query.getDictType()), SysDictData::getDictType, query.getDictType())
+ .orderByAsc(SysDictData::getDictSort)
+ .orderByDesc(SysDictData::getDictCode)
+ .page(new Page<>(query.getPageCurr(), query.getPageSize()));
+ List<String> dictTypeList = result.getRecords().stream().map(SysDictData::getDictType).distinct().collect(Collectors.toList());
+ if (CollUtils.isNotEmpty(dictTypeList)) {
+ PageDTO<SysDictDataVO> sysDictDataVOPageDTO = PageDTO.of(result, SysDictDataVO.class);
+ List<SysDictType> sysDictTypes = dictTypeMapper.selectList(new LambdaQueryWrapper<SysDictType>().in(SysDictType::getDictType, dictTypeList));
+ sysDictDataVOPageDTO.getList().forEach(vo -> {
+ sysDictTypes.forEach(sysDictType -> {
+ if (sysDictType.getDictType().equals(vo.getDictType())) {
+ vo.setDictTypeName(sysDictType.getDictName());
+ }
+ });
+ });
+ return sysDictDataVOPageDTO;
+ }
+ return PageDTO.empty(result);
}
@Override
@@ -142,4 +165,63 @@
baseMapper.insert(sysDictData);
}
}
+
+ @Override
+ public List<SysDictDataVO> medicalWasteTypeList() {
+ return getSysDictDataVOListByType("medical_waste_type", null);
+ }
+
+ @Override
+ public List<SysDictDataVO> medicalWasteTypeListByDictCode(List<Long> wasteTypeCodeList) {
+ return getSysDictDataVOListByType("medical_waste_type", wasteTypeCodeList);
+ }
+
+ @Nullable
+ private List<SysDictDataVO> getSysDictDataVOListByType(String dictType, List<Long> dictCodeList) {
+ List<SysDictData> medicalWasteTypeList = lambdaQuery().eq(SysDictData::getDictType, dictType)
+ .in(CollUtils.isNotEmpty(dictCodeList), SysDictData::getDictCode, dictCodeList)
+ .orderByAsc(SysDictData::getDictSort)
+ .orderByDesc(SysDictData::getDictCode).list();
+ return BeanUtils.copyToList(medicalWasteTypeList, SysDictDataVO.class);
+ }
+
+ /**
+ * 器具类型列表
+ *
+ * @return
+ */
+ @Override
+ public List<SysDictDataVO> equipmentTypeList() {
+ return getSysDictDataVOListByType("protection_equipment_type", null);
+ }
+
+ /**
+ * 规章制度类型列表
+ *
+ * @return
+ */
+ @Override
+ public List<SysDictDataVO> regulationsTypeList() {
+ return getSysDictDataVOListByType("protection_regulation_type", null);
+ }
+
+ /**
+ * 作业类型
+ *
+ * @return
+ */
+ @Override
+ public List<SysDictDataVO> workTypeList() {
+ return getSysDictDataVOListByType("protective_work_type", null);
+ }
+
+ @Override
+ public List<SysDictDataVO> institutionLevelList() {
+ return getSysDictDataVOListByType("institution_level", null);
+ }
+
+ @Override
+ public List<SysDictDataVO> institutionTypeList() {
+ return getSysDictDataVOListByType("institution_type", null);
+ }
}
--
Gitblit v1.7.1