From 0a2d000690b2e6c85024b32c73af0da5339afcb4 Mon Sep 17 00:00:00 2001 From: hxh Date: Thu, 13 Mar 2025 00:35:06 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20checking/tree=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/df/controller/DfCheckingController.java | 4 ++-- .../java/com/kms/yxgh/df/service/DfCheckingService.java | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java index 893aab24..b91b0abf 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java @@ -103,8 +103,8 @@ public class DfCheckingController { @ApiOperation("检查项树数组") @GetMapping("/tree") - public Response> checkingItemTree() { - return Response.ok(dfCheckingService.checkingItems()); + public Response> checkingItemTree(@RequestParam(value = "key", required = false) String key) { + return Response.ok(dfCheckingService.checkingItems(key)); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java index 2d718bc7..4abe0622 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java @@ -47,9 +47,11 @@ public class DfCheckingService extends BaseService public final static String PART_SEPARATOR = ":"; - public List checkingItems() { - String DICT_TYPE = "df_xs_c_classfy"; - return getByDictTypeStream(DICT_TYPE) + public List checkingItems(String key) { + if (StringUtils.isBlank(key)) { + key = "df_xs_c_classfy"; + } + return getByDictTypeStream(key) .map(this::getByDictTypeStream).sorted(Comparator.comparing(CommonCheckingTreeDto::getSort)).collect(Collectors.toList()); }