From 51f460f3b1a8b9fa365e4195c41bb9c5e16fcb7c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 02 一月 2025 10:55:24 +0800
Subject: [PATCH] merge

---
 medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java |   73 +++++++++++++++++++++++++++++++-----
 1 files changed, 63 insertions(+), 10 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..952eecf 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,19 +1,21 @@
 package com.sinata.system.service.impl;
 
+import cn.idev.excel.util.StringUtils;
 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.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;
 
@@ -22,7 +24,7 @@
 
 /**
  * 字典 业务层处理
- * 
+ *
  * @author ruoyi
  */
 @Service
@@ -35,7 +37,7 @@
 
     /**
      * 根据条件分页查询字典数据
-     * 
+     *
      * @param dictData 字典数据信息
      * @return 字典数据集合信息
      */
@@ -47,7 +49,7 @@
 
     /**
      * 根据字典类型和字典键值查询字典数据信息
-     * 
+     *
      * @param dictType 字典类型
      * @param dictValue 字典键值
      * @return 字典标签
@@ -60,7 +62,7 @@
 
     /**
      * 根据字典数据ID查询信息
-     * 
+     *
      * @param dictCode 字典数据ID
      * @return 字典数据
      */
@@ -72,7 +74,7 @@
 
     /**
      * 批量删除字典数据信息
-     * 
+     *
      * @param dictCodes 需要删除的字典数据ID
      */
     @Override
@@ -89,7 +91,7 @@
 
     /**
      * 新增保存字典数据信息
-     * 
+     *
      * @param data 字典数据信息
      * @return 结果
      */
@@ -107,7 +109,7 @@
 
     /**
      * 修改保存字典数据信息
-     * 
+     *
      * @param data 字典数据信息
      * @return 结果
      */
@@ -124,8 +126,8 @@
     }
 
     @Override
-    public PageDTO<SysDictDataVO> pageList(BasePage page) {
-        Page<SysDictData> result = this.lambdaQuery().page(new Page<>(page.getPageCurr(), page.getPageSize()));
+    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()));
         return PageDTO.of(result, SysDictDataVO.class);
     }
 
@@ -142,4 +144,55 @@
             baseMapper.insert(sysDictData);
         }
     }
+
+    @Override
+    public List<SysDictDataVO> medicalWasteTypeList() {
+        return getSysDictDataVOListByType("medical_waste_type");
+    }
+
+    @Nullable
+    private List<SysDictDataVO> getSysDictDataVOListByType(String dictType) {
+        List<SysDictData> medicalWasteTypeList = lambdaQuery().eq(SysDictData::getDictType, dictType).list();
+        return BeanUtils.copyToList(medicalWasteTypeList, SysDictDataVO.class);
+    }
+
+    /**
+     * 器具类型列表
+     *
+     * @return
+     */
+    @Override
+    public List<SysDictDataVO> equipmentTypeList() {
+        return getSysDictDataVOListByType("protection_equipment_type");
+    }
+
+    /**
+     * 规章制度类型列表
+     *
+     * @return
+     */
+    @Override
+    public List<SysDictDataVO> regulationsTypeList() {
+        return getSysDictDataVOListByType("protection_regulation_type");
+    }
+
+    /**
+     * 作业类型
+     *
+     * @return
+     */
+    @Override
+    public List<SysDictDataVO> workTypeList() {
+        return getSysDictDataVOListByType("protective_work_type");
+    }
+
+    @Override
+    public List<SysDictDataVO> institutionLevelList() {
+        return getSysDictDataVOListByType("institution_level");
+    }
+
+    @Override
+    public List<SysDictDataVO> institutionTypeList() {
+        return getSysDictDataVOListByType("institution_type");
+    }
 }

--
Gitblit v1.7.1