KPI / fw-morax

Commit a3299c4d8daee6bbec8dc2c9aa34df4bff0b55ca

Authored by 姜超
1 parent 29de1560

feature(*): 考评排名组计算修改 

考评排名组计算修改
Inline Side-by-side
Showing 1 changed file with 18 additions and 18 deletions
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupRankBizService.java
  View file @a3299c4
... ... @@ -384,15 +384,15 @@ public class EvalGroupRankBizService {
384 384 paramDTO.setTargetType(TargetTypeEnum.NO);
385 385 }
386 386 if (PublicUtil.isNotEmpty(paramDTO.getTargetCalcType())) {
387   - if (multiStage) {
388   - if (TargetCalcTypeEnum.STAGE_TARGET.equals(paramDTO.getTargetCalcType()) ||
389   - TargetCalcTypeEnum.TIME_SCHEDULE.equals(paramDTO.getTargetCalcType())) {
390   - throw new BusinessException("多阶段目标只能选择阶段目标或时间进度");
391   - }
392   - } else if (TargetCalcTypeEnum.TARGET_VALUE.equals(paramDTO.getTargetCalcType()) ||
393   - TargetCalcTypeEnum.MINIMUM.equals(paramDTO.getTargetCalcType())) {
394   - throw new BusinessException("非多阶段目标只能选择百分比或数量");
395   - }
  387 +// if (multiStage) {
  388 +// if (TargetCalcTypeEnum.STAGE_TARGET.equals(paramDTO.getTargetCalcType()) ||
  389 +// TargetCalcTypeEnum.TIME_SCHEDULE.equals(paramDTO.getTargetCalcType())) {
  390 +// throw new BusinessException("多阶段目标只能选择阶段目标或时间进度");
  391 +// }
  392 +// } else if (TargetCalcTypeEnum.TARGET_VALUE.equals(paramDTO.getTargetCalcType()) ||
  393 +// TargetCalcTypeEnum.MINIMUM.equals(paramDTO.getTargetCalcType())) {
  394 +// throw new BusinessException("非多阶段目标只能选择百分比或数量");
  395 +// }
396 396 }
397 397 }
398 398 }
... ... @@ -410,15 +410,15 @@ public class EvalGroupRankBizService {
410 410 continue;
411 411 }
412 412 if (PublicUtil.isNotEmpty(paramDTO.getTargetCalcType())) {
413   - if (multiStage) {
414   - if (TargetCalcTypeEnum.STAGE_TARGET.equals(paramDTO.getTargetCalcType()) ||
415   - TargetCalcTypeEnum.TIME_SCHEDULE.equals(paramDTO.getTargetCalcType())) {
416   - throw new BusinessException("多阶段目标只能选择阶段目标或时间进度");
417   - }
418   - } else if (TargetCalcTypeEnum.TARGET_VALUE.equals(paramDTO.getTargetCalcType()) ||
419   - TargetCalcTypeEnum.MINIMUM.equals(paramDTO.getTargetCalcType())) {
420   - throw new BusinessException("非多阶段目标只能选择百分比或数量");
421   - }
  413 +// if (multiStage) {
  414 +// if (TargetCalcTypeEnum.STAGE_TARGET.equals(paramDTO.getTargetCalcType()) ||
  415 +// TargetCalcTypeEnum.TIME_SCHEDULE.equals(paramDTO.getTargetCalcType())) {
  416 +// throw new BusinessException("多阶段目标只能选择阶段目标或时间进度");
  417 +// }
  418 +// } else if (TargetCalcTypeEnum.TARGET_VALUE.equals(paramDTO.getTargetCalcType()) ||
  419 +// TargetCalcTypeEnum.MINIMUM.equals(paramDTO.getTargetCalcType())) {
  420 +// throw new BusinessException("非多阶段目标只能选择百分比或数量");
  421 +// }
422 422 }
423 423 }
424 424 }
... ...