Commit 39e33db2943a4822c6f67f1974e37521a3e93aa6
Merge branch 'test' into 'main'
计算考评修改 计算考评修改 See merge request !118
Showing
7 changed files
with
53 additions
and
25 deletions
doc/2023-05-18_update.sql
0 → 100644
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
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalShopPool.java
... | ... | @@ -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
... | ... | @@ -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
... | ... | @@ -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
... | ... | @@ -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/KpiPoolBizService.java
... | ... | @@ -643,7 +643,9 @@ 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 | + //todo 原始值 绩效值互换 | |
647 | + kpiPoolDetailVO.setOriginKpiScore(kpiPoolDetailVO.getKpiScore()); | |
648 | + kpiPoolDetailVO.setKpiScore(originKpiScore); | |
647 | 649 | |
648 | 650 | kpiPoolDetailVO.setRewards(new ArrayList<>()); |
649 | 651 | kpiPoolDetailVO.setPunishments(new ArrayList<>()); |
... | ... | @@ -713,29 +715,29 @@ public class KpiPoolBizService { |
713 | 715 | * |
714 | 716 | * @param pool |
715 | 717 | */ |
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 | - } | |
718 | +// public void processRewardPoint(KpiPool pool, KpiPoolDetailVO poolDetailVO) { | |
719 | +// List<KpiRewardPoint> list = kpiRewardPointService.list(Wrappers.<KpiRewardPoint>lambdaQuery() | |
720 | +// .eq(KpiRewardPoint::getUserId, pool.getUserId()) | |
721 | +// .eq(KpiRewardPoint::getPostId, pool.getPostId()) | |
722 | +// .eq(KpiRewardPoint::getShopId, pool.getShopId()) | |
723 | +// .eq(KpiRewardPoint::getMonthly, pool.getMonthly()) | |
724 | +// .eq(KpiRewardPoint::getGroupId, pool.getGroupId()) | |
725 | +// ); | |
726 | +// BigDecimal rewardScore = BigDecimal.ZERO; | |
727 | +// BigDecimal punishScore = BigDecimal.ZERO; | |
728 | +// for (KpiRewardPoint point : list) { | |
729 | +// if (BigDecimal.ZERO.compareTo(point.getScorePoint()) > 0) { | |
730 | +// punishScore = punishScore.add(point.getScorePoint()); | |
731 | +// } else { | |
732 | +// rewardScore = rewardScore.add(point.getScorePoint()); | |
733 | +// } | |
734 | +// } | |
735 | +// //奖励分正数、惩罚分负数,减去奖惩分数,得到原始分数 | |
736 | +// BigDecimal originKpiScore = poolDetailVO.getKpiScore().subtract(rewardScore).subtract(punishScore); | |
737 | +// poolDetailVO.setRewardScore(rewardScore); | |
738 | +// poolDetailVO.setPunishScore(punishScore.abs()); | |
739 | +// poolDetailVO.setOriginKpiScore(originKpiScore); | |
740 | +// } | |
739 | 741 | |
740 | 742 | /** |
741 | 743 | * 获取绩效组指标总分 | ... | ... |