From 33cecc3daaa0a129d37cc713731853500517e1b5 Mon Sep 17 00:00:00 2001 From: hxh Date: Thu, 13 Mar 2025 17:34:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=20=20/sz/checking/tree=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0key?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/sz/controller/SzCheckingController.java | 4 ++-- .../java/com/kms/yxgh/sz/service/SzCheckingService.java | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java index 65d02adf..be8f0ca4 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java @@ -104,8 +104,8 @@ public class SzCheckingController { @ApiOperation("检查项树数组") @GetMapping("/tree") - public Response> checkingItemTree() { - return Response.ok(szCheckingService.checkingItems()); + public Response> checkingItemTree(@RequestParam(value = "key",required = false) String key) { + return Response.ok(szCheckingService.checkingItems(key)); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java index bc1a9bf3..f7dff4b2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java @@ -50,9 +50,11 @@ public class SzCheckingService extends BaseService private final SysDictDataMapper dictDataMapper; - public List checkingItems() { - String DICT_TYPE = "sz_xs_c_classfy"; - return getByDictTypeStream(DICT_TYPE) + public List checkingItems(String key) { + if (StringUtils.isBlank(key)) { + key = "sz_xs_c_classfy"; + } + return getByDictTypeStream(key) .map(this::getByDictTypeStream).sorted(Comparator.comparing(CommonCheckingTreeDto::getSort)).collect(Collectors.toList()); }