Commit 9f48755cdfe4729fce39890a924474d76ae4d34e

Authored by 姜超
1 parent 9a6df217

feature(*): 门店奖惩审批修改

门店奖惩审批修改
fw-morax-service/src/main/java/cn/fw/morax/service/biz/ApprovalBizService.java
... ... @@ -517,6 +517,7 @@ public class ApprovalBizService {
517 517 InitiateApprovalParam.Condition shopCondition = new InitiateApprovalParam.Condition();
518 518 shopCondition.setParamName("shopId");
519 519 shopCondition.setValue(staffInfo.getShopId().toString());
  520 + conditions.add(shopCondition);
520 521 Map extDataMap = new HashMap<String, Object>() {{
521 522 put("id", rewardDist.getId().toString());
522 523 }};
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/kpi/EvalKpiBaseCalculator.java
... ... @@ -169,10 +169,11 @@ public abstract class EvalKpiBaseCalculator implements Calculator&lt;EvalGroupUserS
169 169 useTarget = EvalUseTargetEnum.FIRST_TARGET;
170 170 indicatorValue = reachValue;
171 171 }
  172 + //额外计算类型只能为空 或者 时间进度
172 173 if (PublicUtil.isNotEmpty(extraTargetType) && (!TargetTypeEnum.NO.equals(extraTargetType))) {
173 174 extraReachValue = calcTarget(param.getExtraTargetCalcType(), originValue, param.getExtraTargetValue());
174   - //额外计算类型值 原始计算类型值 用大的那个值
175   - if (PublicUtil.isEmpty(reachValue) || (extraReachValue.compareTo(reachValue) > 0)) {
  175 + //只配置了时间进度 时间进度大于阶段目标 并且 时间进度大于1,取时间进度
  176 + if (PublicUtil.isEmpty(reachValue) || ((extraReachValue.compareTo(reachValue) > 0) && (extraReachValue.compareTo(BigDecimal.ONE) >= 0))) {
176 177 indicatorValue = extraReachValue;
177 178 useTarget = EvalUseTargetEnum.EXTRA_TARGET;
178 179 }
... ...