From 0444972925d67eb9e32c9b2d36f2eda24d2f58c2 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 17 三月 2021 04:03:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DiciIemController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DiciIemController.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DiciIemController.java
index 6536e44..829b8d8 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DiciIemController.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DiciIemController.java
@@ -15,6 +15,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.List;
import java.util.Map;
/**
@@ -48,7 +49,12 @@
dicItem.setDicCode(dictType);
return new FebsResponse().data(dicitemService.findDicItems(dicItem));
}
-
+ @GetMapping(value = "/types/{dictType}")
+ public List<DicItem> dictTypes(@PathVariable String dictType) {
+ DicItem dicItem = new DicItem();
+ dicItem.setDicCode(dictType);
+ return dicitemService.findDicItems(dicItem);
+ }
@GetMapping("list")
public FebsResponse dicitemList(QueryRequest request, DicItem dicitem) {
Map<String, Object> dataTable = FebsUtil.getDataTable(this.dicitemService.findDicItems(request, dicitem));
@@ -103,4 +109,8 @@
throw new FebsException(message);
}
}
+ @GetMapping("getAllDicitemsAll")
+ public List<DicItem> getAllDicitemsAll() {
+ return dicitemService.getAllDicitemsAll();
+ }
}
--
Gitblit v1.8.0