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-admin/src/main/java/com/sinata/web/controller/backend/system/SysDictDataController.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysDictDataController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysDictDataController.java
index a1abea0..95b4abf 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysDictDataController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysDictDataController.java
@@ -6,12 +6,12 @@
import com.sinata.common.core.domain.R;
import com.sinata.common.core.domain.entity.SysDictData;
import com.sinata.common.core.page.TableDataInfo;
-import com.sinata.common.entity.BasePage;
import com.sinata.common.entity.PageDTO;
import com.sinata.common.enums.BusinessType;
import com.sinata.common.utils.StringUtils;
import com.sinata.common.utils.poi.ExcelUtil;
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.service.ISysDictDataService;
import com.sinata.system.service.ISysDictTypeService;
@@ -60,8 +60,8 @@
*/
@ApiOperation("数据字典分页列表")
@PostMapping("/page")
- public R<PageDTO<SysDictDataVO>> page(@Valid @RequestBody BasePage page) {
- return R.ok(dictDataService.pageList(page));
+ public R<PageDTO<SysDictDataVO>> page(@Valid @RequestBody KeyWordQuery query) {
+ return R.ok(dictDataService.pageList(query));
}
/**
@@ -132,6 +132,30 @@
public R<List<SysDictDataVO>> workTypeList() {
return R.ok(dictDataService.workTypeList());
}
+
+ /**
+ * 医疗机构级别
+ *
+ * @return
+ */
+ @ApiOperation("医疗机构级别")
+ @GetMapping("/institutionLevelList")
+ public R<List<SysDictDataVO>> institutionLevelList() {
+ return R.ok(dictDataService.institutionLevelList());
+ }
+
+ /**
+ * 医疗机构性质
+ *
+ * @return
+ */
+ @ApiOperation("医疗机构性质")
+ @GetMapping("/institutionTypeList")
+ public R<List<SysDictDataVO>> institutionTypeList() {
+ return R.ok(dictDataService.institutionTypeList());
+ }
+
+
@PreAuthorize("@ss.hasPermi('system:dict:list')")
@GetMapping("/list")
public TableDataInfo list(SysDictData dictData)
--
Gitblit v1.7.1