KPI / fw-morax

Commit 0caae0d1e3ed0864c1b70db9e6546483a0ca49a6

Authored by 姜超
1 parent 224ee28b

feature(*): 修改排名展示 

修改排名展示
Inline Side-by-side
Showing 3 changed files with 10 additions and 5 deletions
fw-morax-dao/src/main/resources/mapper/eval/EvalGroupRewardHitLogMapper.xml
  View file @0caae0d
... ... @@ -15,7 +15,7 @@
15 15 t1.proportion_value,
16 16 t1.data_date,
17 17 t1.group_id,
18   - t2.name
  18 + t2.user_name as name
19 19 FROM
20 20 eval_group_reward_hit_log t1
21 21 LEFT JOIN eval_user_pool t2 ON t1.pool_id = t2.id
... ... @@ -38,10 +38,10 @@
38 38 t1.proportion_value,
39 39 t1.data_date,
40 40 t1.group_id,
41   - t2.name
  41 + t2.shop_name as name
42 42 FROM
43 43 eval_group_reward_hit_log t1
44   - LEFT JOIN eval_user_pool t2 ON t1.pool_id = t2.id
  44 + LEFT JOIN eval_shop_pool t2 ON t1.pool_id = t2.id
45 45 WHERE
46 46 t1.eval_group_reward_id = #{evalGroupRewardId}
47 47 AND t1.data_date = #{dataDate}
... ...
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/EvalGroupRewardHitLogVO.java
  View file @0caae0d
... ... @@ -78,8 +78,11 @@ public class EvalGroupRewardHitLogVO {
78 78 /**
79 79 * 转换为百分数展示
80 80 */
81   - public void convertValueToPercent(){
  81 + public void convertValueToPercent(DataTypeEnum laddersType){
82 82 this.setProportionValue(this.getProportionValue().multiply(Constant.ONE_HUNDRED));
  83 +// if (DataTypeEnum.RATIO.equals(laddersType)) {
  84 +// this.setHitCommissionValue(this.getHitCommissionValue().multiply(Constant.ONE_HUNDRED));
  85 +// }
83 86 }
84 87  
85 88  
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupPoolService.java
  View file @0caae0d
... ... @@ -1257,13 +1257,15 @@ public class EvalGroupPoolService {
1257 1257 }
1258 1258  
1259 1259 public List<EvalGroupRewardHitLogVO> queryRewardProportion(EvalScopeEnum scopeType, Long evalGroupRewardId, LocalDate dataDate) {
  1260 + EvalGroupReward reward = evalGroupRewardService.getById(evalGroupRewardId);
  1261 + BV.notNull(reward, "奖惩不存在");
1260 1262 List<EvalGroupRewardHitLogVO> hitLogVOS = null;
1261 1263 if (EvalScopeEnum.STAFF.equals(scopeType)) {
1262 1264 hitLogVOS = evalGroupRewardHitLogService.getUserHitLogs(evalGroupRewardId, dataDate);
1263 1265 } else {
1264 1266 hitLogVOS = evalGroupRewardHitLogService.getShopHitLogs(evalGroupRewardId, dataDate);
1265 1267 }
1266   - hitLogVOS.stream().forEach(hitLog -> hitLog.convertValueToPercent());
  1268 + hitLogVOS.stream().forEach(hitLog -> hitLog.convertValueToPercent(reward.getLaddersType()));
1267 1269 return hitLogVOS;
1268 1270 }
1269 1271 }
... ...