From 2dc478231fd09a88a4d86d44388ae807aca08bc5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 10:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 0687962..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,15 +1,16 @@
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;
@@ -125,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);
}
@@ -184,4 +185,14 @@
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