From 9f48755cdfe4729fce39890a924474d76ae4d34e Mon Sep 17 00:00:00 2001
From: jiangchao <jiangchao@feewee.cn>
Date: Wed, 24 May 2023 17:44:46 +0800
Subject: [PATCH] feature(*): 门店奖惩审批修改

---
 fw-morax-service/src/main/java/cn/fw/morax/service/biz/ApprovalBizService.java                        | 1 +
 fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/kpi/EvalKpiBaseCalculator.java | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/ApprovalBizService.java b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/ApprovalBizService.java
index 06ade41..c39c46d 100644
--- a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/ApprovalBizService.java
+++ b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/ApprovalBizService.java
@@ -517,6 +517,7 @@ public class ApprovalBizService {
         InitiateApprovalParam.Condition shopCondition = new InitiateApprovalParam.Condition();
         shopCondition.setParamName("shopId");
         shopCondition.setValue(staffInfo.getShopId().toString());
+        conditions.add(shopCondition);
         Map extDataMap = new HashMap<String, Object>() {{
             put("id", rewardDist.getId().toString());
         }};
diff --git a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/kpi/EvalKpiBaseCalculator.java b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/kpi/EvalKpiBaseCalculator.java
index 5ede373..8dd2076 100644
--- a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/kpi/EvalKpiBaseCalculator.java
+++ b/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
                 useTarget = EvalUseTargetEnum.FIRST_TARGET;
                 indicatorValue = reachValue;
             }
+            //额外计算类型只能为空  或者  时间进度
             if (PublicUtil.isNotEmpty(extraTargetType) && (!TargetTypeEnum.NO.equals(extraTargetType))) {
                 extraReachValue = calcTarget(param.getExtraTargetCalcType(), originValue, param.getExtraTargetValue());
-                //额外计算类型值  原始计算类型值  用大的那个值
-                if (PublicUtil.isEmpty(reachValue) || (extraReachValue.compareTo(reachValue) > 0)) {
+                //只配置了时间进度  时间进度大于阶段目标 并且  时间进度大于1，取时间进度
+                if (PublicUtil.isEmpty(reachValue) || ((extraReachValue.compareTo(reachValue) > 0) && (extraReachValue.compareTo(BigDecimal.ONE) >= 0))) {
                     indicatorValue = extraReachValue;
                     useTarget = EvalUseTargetEnum.EXTRA_TARGET;
                 }
--
libgit2 0.22.2