From 863b22dd84364ef5a9c4d5057af5063f94e8f346 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 九月 2024 03:45:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java
index aaecb59..078814f 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java
@@ -11,7 +11,10 @@
import org.springframework.stereotype.Service;
import utils.DateUtils;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* 杩濈害瑙勫垯Service涓氬姟灞傚鐞�
@@ -102,7 +105,17 @@
}
@Override
- public List<CalculateRuleCascaderVO> getRuleListByUnitId(Integer unitId) {
- return calculateRuleMapper.getRuleListByUnitId(unitId, DateUtils.getDate());
+ public List<CalculateRuleCascaderVO> getRuleListByUnitId(Integer unitId) {
+ List<CalculateRuleCascaderVO> ruleListByUnitId = calculateRuleMapper.getRuleListByUnitId(unitId, DateUtils.getDate());
+ Map<String, List<CalculateRuleCascaderVO>> map = ruleListByUnitId.stream().collect(Collectors.groupingBy(CalculateRuleCascaderVO::getRuleName));
+ List<CalculateRuleCascaderVO> result = new ArrayList<>();
+ map.forEach((str,list)->{
+ CalculateRuleCascaderVO vo = new CalculateRuleCascaderVO();
+ vo.setValue(str);
+ vo.setLabel(str);
+ vo.setChildren(list);
+ result.add(vo);
+ });
+ return result;
}
}
--
Gitblit v1.8.0