From 9c94020ee54e110ba4c88088a9fafbe612057de4 Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期四, 19 六月 2025 16:57:20 +0800 Subject: [PATCH] 所有关口进线的二级界面(表格/曲线)均增加(CCPP/135/CDQ/TRT/余热)的选项 --- ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java index 9ae480d..b0f53f2 100644 --- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java +++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java @@ -745,11 +745,22 @@ if (!CollectionUtils.isEmpty(list0)) { list.addAll(list0); } - Map<String, Object> params1 = new HashMap<>(); - params1.put("groupName", "COMMON1"); - List<PowerNetDropdownEntity> list1 = powerNetDropdownService.list(params1); - if (!CollectionUtils.isEmpty(list1)) { - list.addAll(list1); + + // 所有关口进线的二级界面(表格/曲线)均增加(CCPP/135/CDQ/TRT/余热)的选项。 + if(entity.getSort() <= 14) { + Map<String, Object> params1 = new HashMap<>(); + params1.put("groupName", "COMMON1"); + List<PowerNetDropdownEntity> list1 = powerNetDropdownService.list(params1); + if (!CollectionUtils.isEmpty(list1)) { + list.addAll(list1); + } + + Map<String, Object> params2 = new HashMap<>(); + params2.put("groupName", "COMMON2"); + List<PowerNetDropdownEntity> list2 = powerNetDropdownService.list(params2); + if (!CollectionUtils.isEmpty(list2)) { + list.addAll(list2); + } } List<String> points = list.stream().map(item -> { -- Gitblit v1.9.3