KPI / fw-morax

Commit a16a4772c10ec4e679b68bb4da8a67a18c186c18

Authored by 姜超
1 parent 2df28e36

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

考评排名组保存修改
Inline Side-by-side
Showing 3 changed files with 8 additions and 4 deletions
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/EvalGroupIndicatorParamVO.java
  View file @a16a477
... ... @@ -122,10 +122,14 @@ public class EvalGroupIndicatorParamVO {
122 122 */
123 123 public void processPercent() {
124 124 this.setProportion(this.getProportion().multiply(Constant.ONE_HUNDRED));
125   - if (PublicUtil.isNotEmpty(this.getTargetType()) && TargetTypeEnum.RATIO.equals(this.getTargetType())) {
  125 + if (PublicUtil.isNotEmpty(this.getTargetValue()) &&
  126 + PublicUtil.isNotEmpty(this.getTargetType()) &&
  127 + TargetTypeEnum.RATIO.equals(this.getTargetType())) {
126 128 this.setTargetValue(this.getTargetValue().multiply(Constant.ONE_HUNDRED));
127 129 }
128   - if (PublicUtil.isNotEmpty(this.getExtraTargetType()) && TargetTypeEnum.RATIO.equals(this.getExtraTargetType())) {
  130 + if (PublicUtil.isNotEmpty(this.getTargetValue()) &&
  131 + PublicUtil.isNotEmpty(this.getExtraTargetType()) &&
  132 + TargetTypeEnum.RATIO.equals(this.getExtraTargetType())) {
129 133 this.setExtraTargetValue(this.getExtraTargetValue().multiply(Constant.ONE_HUNDRED));
130 134 }
131 135 }
... ...
fw-morax-server/src/main/java/cn/fw/morax/server/consumer/FlowConsumer.java
  View file @a16a477
... ... @@ -91,7 +91,7 @@ public class FlowConsumer implements RocketMQListener<ApprovalResult> {
91 91 }
92 92 break;
93 93 }
94   - case EVAL_REWARD_DIST: {
  94 + case KPI_GROUP_RANK: {
95 95 SettingDraft settingDraft = settingDraftBizService.approvalDraft(approvalRecord, result);
96 96 if (result.getAgree()) {
97 97 kpiGroupBizService.saveKpiGroupRankDraft(approvalRecord, settingDraft);
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/ApprovalBizService.java
  View file @a16a477
... ... @@ -386,7 +386,7 @@ public class ApprovalBizService {
386 386 ApprovalRecord approvalRecord = ApprovalRecord.builder()
387 387 .approvalNo(approvalNo)
388 388 .approvalStatus(ApprovalStatusEnum.IN_APPROVAL)
389   - .approvalType(ApprovalTypeEnum.KPI)
  389 + .approvalType(ApprovalTypeEnum.KPI_GROUP_RANK)
390 390 .dataId(settingDraft.getId())
391 391 .groupId(kpiGroupRank.getGroupId())
392 392 .build();
... ...