KPI / fw-morax

Commit 5e6a692238afa6121ff485589c3fb775a35bfb1a

Authored by 姜超
1 parent 94675d99

feature(*): 筛选修改 

筛选修改
Inline Side-by-side
Showing 8 changed files with 54 additions and 27 deletions
doc/2023-05-18_update.sql 0 → 100644
  View file @5e6a692
  1 +ALTER TABLE `fw_morax`.`eval_shop_pool`
  2 + CHANGE COLUMN `eval_group_stage_id` `eval_group_rank_stage_id` bigint(20) NOT NULL COMMENT '考评排名阶段id' AFTER `eval_group_rank_id`;
  3 +ALTER TABLE `fw_morax`.`eval_user_pool`
  4 + CHANGE COLUMN `eval_group_stage_id` `eval_group_rank_stage_id` bigint(20) NOT NULL COMMENT '考评阶段id' AFTER `eval_group_rank_id`;
  5 +ALTER TABLE `fw_morax`.`eval_group_user`
  6 + ADD COLUMN `eval_group_rank_stage_id` bigint(20) NOT NULL COMMENT '考评排名组阶段id' AFTER `eval_group_rank_id`;
... ...
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalGroupUser.java
  View file @5e6a692
... ... @@ -24,6 +24,10 @@ public class EvalGroupUser extends BaseAuditableTimeEntity<EvalGroupUser, Long>
24 24 */
25 25 private Long evalGroupRankId;
26 26 /**
  27 + * 考评排名组阶段id
  28 + */
  29 + private Long evalGroupRankStageId;
  30 + /**
27 31 * 考评组编码
28 32 */
29 33 private String egc;
... ...
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalShopPool.java
  View file @5e6a692
... ... @@ -39,6 +39,14 @@ public class EvalShopPool extends BaseAuditableTimeEntity<EvalShopPool, Long> {
39 39 * 考评组id
40 40 */
41 41 private Long evalGroupId;
  42 + /**
  43 + * 考评排名组id
  44 + */
  45 + private Long evalGroupRankId;
  46 + /**
  47 + * 考评排名组阶段id
  48 + */
  49 + private Long evalGroupRankStageId;
42 50  
43 51 // /**
44 52 // * 用户id
... ...
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalUserPool.java
  View file @5e6a692
... ... @@ -29,12 +29,15 @@ public class EvalUserPool extends BaseAuditableTimeEntity<EvalUserPool, Long> {
29 29 * 考评组编码
30 30 */
31 31 private String egc;
32   -
33 32 /**
34 33 * 考评排名组id
35 34 */
36 35 private Long evalGroupRankId;
37 36 /**
  37 + * 考评排名组阶段id
  38 + */
  39 + private Long evalGroupRankStageId;
  40 + /**
38 41 * 考评组id
39 42 */
40 43 private Long evalGroupId;
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupUserBizService.java
  View file @5e6a692
... ... @@ -88,6 +88,7 @@ public class EvalGroupUserBizService {
88 88 }
89 89 EvalGroup evalGroup = shopKpiGroupMap.get(user.getShopId());
90 90 user.setEvalGroupRankId(evalGroup.getEvalGroupRankId());
  91 + user.setEvalGroupRankStageId(evalGroup.getEvalGroupRankStageId());
91 92 user.setEvalGroupId(evalGroup.getId());
92 93 user.setEgc(evalGroup.getEgc());
93 94 }
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalPoolCommonService.java
  View file @5e6a692
... ... @@ -126,6 +126,8 @@ public class EvalPoolCommonService {
126 126 EvalShopPool evalShopPool = new EvalShopPool();
127 127 evalShopPool.setEgc(evalGroup.getEgc());
128 128 evalShopPool.setEvalGroupId(evalGroup.getId());
  129 + evalShopPool.setEvalGroupRankId(evalGroup.getEvalGroupRankId());
  130 + evalShopPool.setEvalGroupRankStageId(evalGroup.getEvalGroupRankStageId());
129 131 // evalShopPool.setEvalId(evalGroup.getEvalId());
130 132 evalShopPool.setShopId(shopId);
131 133 evalShopPool.setShopName(shopDTO.getShortName());
... ... @@ -207,6 +209,8 @@ public class EvalPoolCommonService {
207 209 // evalUserPool.setEvalId(user.getEvalGroupRankId());
208 210 evalUserPool.setEgc(user.getEgc());
209 211 evalUserPool.setEvalGroupId(user.getEvalGroupId());
  212 + evalUserPool.setEvalGroupRankId(user.getEvalGroupRankId());
  213 + evalUserPool.setEvalGroupRankStageId(user.getEvalGroupRankStageId());
210 214 evalUserPool.setUserId(user.getUserId());
211 215 evalUserPool.setUserName(user.getUserName());
212 216 evalUserPool.setPostId(user.getPostId());
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/kpi/CombineIndicatorBizService.java
  View file @5e6a692
... ... @@ -69,7 +69,7 @@ public class CombineIndicatorBizService {
69 69 public List<CombineAndEvalIndicatorVO> combineAndEvalIndicators(CombineIndicatorQueryDTO dto) {
70 70  
71 71 List<CombineAndEvalIndicatorVO> combineAndEvalIndicatorVOS = Lists.newArrayListWithCapacity(100);
72   - if (PublicUtil.isEmpty(dto.getCombineIndicator()) || Boolean.TRUE.equals(dto.getCombineIndicator())) {
  72 + if (PublicUtil.isEmpty(dto.getCombineIndicator()) || Boolean.FALSE.equals(dto.getCombineIndicator())) {
73 73 List<EvalIndicator> evalIndicators = evalIndicatorService.list(Wrappers.<EvalIndicator>lambdaQuery()
74 74 .eq(PublicUtil.isNotEmpty(dto.getSysId()), EvalIndicator::getSysId, dto.getSysId())
75 75 .eq(PublicUtil.isNotEmpty(dto.getRoleCode()), EvalIndicator::getRoleCode, dto.getRoleCode())
... ... @@ -100,7 +100,7 @@ public class CombineIndicatorBizService {
100 100 return combineAndEvalIndicatorVOS;
101 101 }
102 102  
103   - if (PublicUtil.isEmpty(dto.getCombineIndicator()) || Boolean.FALSE.equals(dto.getCombineIndicator())) {
  103 + if (PublicUtil.isEmpty(dto.getCombineIndicator()) || Boolean.TRUE.equals(dto.getCombineIndicator())) {
104 104 List<CombineIndicator> combineIndicators = combineIndicatorService.list(Wrappers.<CombineIndicator>lambdaQuery()
105 105 .eq(CombineIndicator::getGroupId, dto.getGroupId())
106 106 .eq(PublicUtil.isNotEmpty(dto.getEnable()), CombineIndicator::getEnable, dto.getEnable())
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/kpi/KpiPoolBizService.java
  View file @5e6a692
... ... @@ -643,7 +643,8 @@ public class KpiPoolBizService {
643 643 BigDecimal originKpiScore = kpiPoolDetailVO.getKpiScore().subtract(rewardScore).subtract(punishScore);
644 644 kpiPoolDetailVO.setRewardScore(rewardScore);
645 645 kpiPoolDetailVO.setPunishScore(punishScore.abs());
646   - kpiPoolDetailVO.setOriginKpiScore(originKpiScore);
  646 + kpiPoolDetailVO.setOriginKpiScore(kpiPoolDetailVO.getKpiScore());
  647 + kpiPoolDetailVO.setKpiScore(originKpiScore);
647 648  
648 649 kpiPoolDetailVO.setRewards(new ArrayList<>());
649 650 kpiPoolDetailVO.setPunishments(new ArrayList<>());
... ... @@ -713,29 +714,29 @@ public class KpiPoolBizService {
713 714 *
714 715 * @param pool
715 716 */
716   - public void processRewardPoint(KpiPool pool, KpiPoolDetailVO poolDetailVO) {
717   - List<KpiRewardPoint> list = kpiRewardPointService.list(Wrappers.<KpiRewardPoint>lambdaQuery()
718   - .eq(KpiRewardPoint::getUserId, pool.getUserId())
719   - .eq(KpiRewardPoint::getPostId, pool.getPostId())
720   - .eq(KpiRewardPoint::getShopId, pool.getShopId())
721   - .eq(KpiRewardPoint::getMonthly, pool.getMonthly())
722   - .eq(KpiRewardPoint::getGroupId, pool.getGroupId())
723   - );
724   - BigDecimal rewardScore = BigDecimal.ZERO;
725   - BigDecimal punishScore = BigDecimal.ZERO;
726   - for (KpiRewardPoint point : list) {
727   - if (BigDecimal.ZERO.compareTo(point.getScorePoint()) > 0) {
728   - punishScore = punishScore.add(point.getScorePoint());
729   - } else {
730   - rewardScore = rewardScore.add(point.getScorePoint());
731   - }
732   - }
733   - //奖励分正数、惩罚分负数，减去奖惩分数，得到原始分数
734   - BigDecimal originKpiScore = poolDetailVO.getKpiScore().subtract(rewardScore).subtract(punishScore);
735   - poolDetailVO.setRewardScore(rewardScore);
736   - poolDetailVO.setPunishScore(punishScore.abs());
737   - poolDetailVO.setOriginKpiScore(originKpiScore);
738   - }
  717 +// public void processRewardPoint(KpiPool pool, KpiPoolDetailVO poolDetailVO) {
  718 +// List<KpiRewardPoint> list = kpiRewardPointService.list(Wrappers.<KpiRewardPoint>lambdaQuery()
  719 +// .eq(KpiRewardPoint::getUserId, pool.getUserId())
  720 +// .eq(KpiRewardPoint::getPostId, pool.getPostId())
  721 +// .eq(KpiRewardPoint::getShopId, pool.getShopId())
  722 +// .eq(KpiRewardPoint::getMonthly, pool.getMonthly())
  723 +// .eq(KpiRewardPoint::getGroupId, pool.getGroupId())
  724 +// );
  725 +// BigDecimal rewardScore = BigDecimal.ZERO;
  726 +// BigDecimal punishScore = BigDecimal.ZERO;
  727 +// for (KpiRewardPoint point : list) {
  728 +// if (BigDecimal.ZERO.compareTo(point.getScorePoint()) > 0) {
  729 +// punishScore = punishScore.add(point.getScorePoint());
  730 +// } else {
  731 +// rewardScore = rewardScore.add(point.getScorePoint());
  732 +// }
  733 +// }
  734 +// //奖励分正数、惩罚分负数，减去奖惩分数，得到原始分数
  735 +// BigDecimal originKpiScore = poolDetailVO.getKpiScore().subtract(rewardScore).subtract(punishScore);
  736 +// poolDetailVO.setRewardScore(rewardScore);
  737 +// poolDetailVO.setPunishScore(punishScore.abs());
  738 +// poolDetailVO.setOriginKpiScore(originKpiScore);
  739 +// }
739 740  
740 741 /**
741 742 * 获取绩效组指标总分
... ...