KPI / fw-morax

Commit 0470abadfb6aa563ae4f5b28f5e944231f27793f

Authored by 姜超
2 parents 5c737058 738a9a38

Merge branch 'test' into 'main' 

Test



See merge request !116
Inline Side-by-side
Showing 2 changed files with 7 additions and 7 deletions
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/EvalGroupIndicatorParamVO.java
  View file @0470aba
... ... @@ -127,7 +127,7 @@ public class EvalGroupIndicatorParamVO {
127 127 TargetTypeEnum.RATIO.equals(this.getTargetType())) {
128 128 this.setTargetValue(this.getTargetValue().multiply(Constant.ONE_HUNDRED));
129 129 }
130   - if (PublicUtil.isNotEmpty(this.getTargetValue()) &&
  130 + if (PublicUtil.isNotEmpty(this.getExtraTargetValue()) &&
131 131 PublicUtil.isNotEmpty(this.getExtraTargetType()) &&
132 132 TargetTypeEnum.RATIO.equals(this.getExtraTargetType())) {
133 133 this.setExtraTargetValue(this.getExtraTargetValue().multiply(Constant.ONE_HUNDRED));
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/kpi/KpiGroupRankBizService.java
  View file @0470aba
... ... @@ -75,21 +75,21 @@ public class KpiGroupRankBizService {
75 75 }
76 76  
77 77 List<KpiGroupRankVO> kpiGroupRankVOS = kpiGroupRankService.queryPageRank(dto);
78   - List<String> kgcs = kpiGroupRankVOS.stream().map(KpiGroupRankVO::getKgcs).collect(ArrayList::new, List::addAll, List::addAll);
  78 + List<Long> kpiGroupIds = kpiGroupRankVOS.stream().map(KpiGroupRankVO::getKpiGroupIds).collect(ArrayList::new, List::addAll, List::addAll);
79 79 List<KpiGroup> kpiGroups = kpiGroupService.list(Wrappers.<KpiGroup>lambdaQuery()
80 80 .eq(KpiGroup::getStatus, SettingStatusEnum.EFFECTIVE)
81   - .in(KpiGroup::getKgc, kgcs)
  81 + .in(KpiGroup::getId, kpiGroupIds)
82 82 );
83   - Map<String, KpiGroup> kgcKpiGroupMap = kpiGroups.stream().collect(Collectors.toMap(KpiGroup::getKgc, Function.identity(), (v1, v2) -> v1));
  83 + Map<Long, KpiGroup> kgcKpiGroupMap = kpiGroups.stream().collect(Collectors.toMap(KpiGroup::getId, Function.identity(), (v1, v2) -> v1));
84 84 for (KpiGroupRankVO kpiGroupRankVO : kpiGroupRankVOS) {
85 85 kpiGroupRankVO.setPostIds(new ArrayList<>());
86 86 kpiGroupRankVO.setPostNames(new HashSet<>());
87 87 kpiGroupRankVO.setShopIds(new ArrayList<>());
88 88 kpiGroupRankVO.setShopNames(new HashSet<>());
89 89 kpiGroupRankVO.setKpiGroupNames(new ArrayList<>());
90   - for (String kgc : kpiGroupRankVO.getKgcs()) {
91   - if (kgcKpiGroupMap.containsKey(kgc)) {
92   - KpiGroup kpiGroup = kgcKpiGroupMap.get(kgc);
  90 + for (Long kpiGroupId : kpiGroupRankVO.getKpiGroupIds()) {
  91 + if (kgcKpiGroupMap.containsKey(kpiGroupId)) {
  92 + KpiGroup kpiGroup = kgcKpiGroupMap.get(kpiGroupId);
93 93 kpiGroupRankVO.getPostIds().add(kpiGroup.getPostId());
94 94 kpiGroupRankVO.getPostNames().add(kpiGroup.getPostName());
95 95 kpiGroupRankVO.getShopIds().addAll(kpiGroup.getShopIds());
... ...