Commit 9f48755cdfe4729fce39890a924474d76ae4d34e
1 parent
9a6df217
feature(*): 门店奖惩审批修改
门店奖惩审批修改
Showing
2 changed files
with
4 additions
and
2 deletions
fw-morax-service/src/main/java/cn/fw/morax/service/biz/ApprovalBizService.java
@@ -517,6 +517,7 @@ public class ApprovalBizService { | @@ -517,6 +517,7 @@ public class ApprovalBizService { | ||
517 | InitiateApprovalParam.Condition shopCondition = new InitiateApprovalParam.Condition(); | 517 | InitiateApprovalParam.Condition shopCondition = new InitiateApprovalParam.Condition(); |
518 | shopCondition.setParamName("shopId"); | 518 | shopCondition.setParamName("shopId"); |
519 | shopCondition.setValue(staffInfo.getShopId().toString()); | 519 | shopCondition.setValue(staffInfo.getShopId().toString()); |
520 | + conditions.add(shopCondition); | ||
520 | Map extDataMap = new HashMap<String, Object>() {{ | 521 | Map extDataMap = new HashMap<String, Object>() {{ |
521 | put("id", rewardDist.getId().toString()); | 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<EvalGroupUserS | @@ -169,10 +169,11 @@ public abstract class EvalKpiBaseCalculator implements Calculator<EvalGroupUserS | ||
169 | useTarget = EvalUseTargetEnum.FIRST_TARGET; | 169 | useTarget = EvalUseTargetEnum.FIRST_TARGET; |
170 | indicatorValue = reachValue; | 170 | indicatorValue = reachValue; |
171 | } | 171 | } |
172 | + //额外计算类型只能为空 或者 时间进度 | ||
172 | if (PublicUtil.isNotEmpty(extraTargetType) && (!TargetTypeEnum.NO.equals(extraTargetType))) { | 173 | if (PublicUtil.isNotEmpty(extraTargetType) && (!TargetTypeEnum.NO.equals(extraTargetType))) { |
173 | extraReachValue = calcTarget(param.getExtraTargetCalcType(), originValue, param.getExtraTargetValue()); | 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 | indicatorValue = extraReachValue; | 177 | indicatorValue = extraReachValue; |
177 | useTarget = EvalUseTargetEnum.EXTRA_TARGET; | 178 | useTarget = EvalUseTargetEnum.EXTRA_TARGET; |
178 | } | 179 | } |