KPI / fw-morax

Commit 2df28e36fe22c451569e427095a5fb3dcb9b76a1

Authored by 姜超
1 parent f91cbd76

feature(*): 考评排名组保存修改 

考评排名组保存修改
Inline Side-by-side
Showing 4 changed files with 11 additions and 4 deletions
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalGroupIndicatorParam.java
  View file @2df28e3
... ... @@ -113,10 +113,14 @@ public class EvalGroupIndicatorParam extends BaseAuditableTimeEntity<EvalGroupIn
113 113 */
114 114 public void dividePercent() {
115 115 this.setProportion(this.getProportion().divide(Constant.ONE_HUNDRED, 4, RoundingMode.HALF_UP));
116   - if (PublicUtil.isNotEmpty(this.getTargetType()) && TargetTypeEnum.RATIO.equals(this.getTargetType())) {
  116 + if (PublicUtil.isNotEmpty(this.getExtraTargetValue()) &&
  117 + PublicUtil.isNotEmpty(this.getTargetType()) &&
  118 + TargetTypeEnum.RATIO.equals(this.getTargetType())) {
117 119 this.setTargetValue(this.getTargetValue().divide(Constant.ONE_HUNDRED, 4, RoundingMode.HALF_UP));
118 120 }
119   - if (PublicUtil.isNotEmpty(this.getExtraTargetType()) && TargetTypeEnum.RATIO.equals(this.getExtraTargetType())) {
  121 + if (PublicUtil.isNotEmpty(this.getExtraTargetValue()) &&
  122 + PublicUtil.isNotEmpty(this.getExtraTargetType()) &&
  123 + TargetTypeEnum.RATIO.equals(this.getExtraTargetType())) {
120 124 this.setExtraTargetValue(this.getExtraTargetValue().divide(Constant.ONE_HUNDRED, 4, RoundingMode.HALF_UP));
121 125 }
122 126 }
... ...
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalGroupReward.java
  View file @2df28e3
... ... @@ -45,7 +45,7 @@ public class EvalGroupReward extends BaseAuditableTimeEntity<EvalGroupReward, Lo
45 45 /**
46 46 * 阶段id
47 47 */
48   - private Long evalStageId;
  48 + private Long evalGroupRankStageId;
49 49  
50 50 /**
51 51 * 维度id
... ...
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalGroupRewardDim.java
  View file @2df28e3
... ... @@ -36,7 +36,7 @@ public class EvalGroupRewardDim extends BaseAuditableTimeEntity<EvalGroupRewardD
36 36 /**
37 37 * 考评阶段id
38 38 */
39   - private Long evalStageId;
  39 + private Long evalGroupRankStageId;
40 40  
41 41 /**
42 42 * 维度类型 1：人员 2：门店
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupDataService.java
  View file @2df28e3
... ... @@ -212,6 +212,7 @@ public class EvalGroupDataService {
212 212 @Transactional(rollbackFor = Exception.class)
213 213 public void saveEvalGroupReward(EvalGroup evalGroup, List<EvalGroupRewardDimDTO> dims, EvalScopeEnum type) {
214 214 Long evalGroupId = evalGroup.getId();
  215 + Long evalGroupRankStageId = evalGroup.getEvalGroupRankStageId();
215 216 LinkedList<EvalGroupRewardParam> rewardParams = Lists.newLinkedList();
216 217 LinkedList<EvalGroupRewardLadders> rewardLadders = Lists.newLinkedList();
217 218 LinkedList<EvalGroupRewardPrecondition> rewardPreconditions = Lists.newLinkedList();
... ... @@ -219,12 +220,14 @@ public class EvalGroupDataService {
219 220 EvalGroupRewardDim dim = PublicUtil.copy(dimDTO, EvalGroupRewardDim.class);
220 221 dim.setType(type);
221 222 dim.setEvalGroupId(evalGroupId);
  223 + dim.setEvalGroupRankStageId(evalGroupRankStageId);
222 224 evalGroupDimService.save(dim);
223 225 final Long dimId = dim.getId();
224 226 for (EvalGroupRewardDTO rewardDTO : dimDTO.getRewards()) {
225 227 EvalGroupReward reward = PublicUtil.copy(rewardDTO, EvalGroupReward.class);
226 228 reward.setEvalGroupId(evalGroupId);
227 229 reward.setEvalGroupDimId(dimId);
  230 + reward.setEvalGroupRankStageId(evalGroupRankStageId);
228 231 evalGroupRewardService.save(reward);
229 232 Long rewardId = reward.getId();
230 233 //没有配置计算方式
... ...