KPI / fw-morax

Commit 45812324a05a14dc22b83670fba3cae08bbba00a

Authored by 姜超
1 parent b5ba827d

feature(*): 修改门店名称 

修改门店名称
Inline Side-by-side
Showing 5 changed files with 7 additions and 1 deletions
fw-morax-service/src/main/java/cn/fw/morax/service/biz/IndicatorCommonService.java
  View file @4581232
... ... @@ -79,7 +79,7 @@ public class IndicatorCommonService {
79 79 .eq(IndicatorUserTargetValue::getYn, Boolean.TRUE)
80 80 , Boolean.FALSE);
81 81 if (PublicUtil.isEmpty(indicatorUserTargetValue)) {
82   - return new MonthlyTargetValueVO();
  82 + return null;
83 83 }
84 84 MonthlyTargetValueVO monthlyTargetValueVO = PublicUtil.copy(indicatorUserTargetValue, MonthlyTargetValueVO.class);
85 85 this.setOriginInfo(monthlyTargetValueVO, indicators);
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/eval/reward/EvalRewardRankCalculator.java
  View file @4581232
... ... @@ -122,6 +122,7 @@ public class EvalRewardRankCalculator extends EvalRewardBaseCalculator {
122 122  
123 123 userShop.setEvalGroupRewardAmount(salaryValue);
124 124 BigDecimal hitCommissionValue = rankLog.getReachValue();
  125 + //清除项目命中日志
125 126 clearProjectHitLog(evalGroupRewardId, userShop);
126 127 BigDecimal finalSalary = salaryValue;
127 128 saveProjectHitLog(evalGroupRewardId, userShop, log -> {
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalPoolCommonService.java
  View file @4581232
... ... @@ -155,6 +155,7 @@ public class EvalPoolCommonService {
155 155 .eq(EvalUserPool::getYn, Boolean.TRUE)
156 156 , Boolean.FALSE);
157 157 if (PublicUtil.isNotEmpty(evalUserPool)) {
  158 + evalUserPool.setShopName(user.getShopName());
158 159 return evalUserPool;
159 160 }
160 161 //同一个考评组的 调岗员工 修改调岗数据
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/kpi/KpiPoolCommonService.java
  View file @4581232
... ... @@ -219,6 +219,8 @@ public class KpiPoolCommonService {
219 219 if (Objects.nonNull(user.getLeaveDate())){
220 220 kpiPool.setLeaveDate(user.getLeaveDate());
221 221 }
  222 + //2024年4月25日处理门店数据
  223 + kpiPool.setShopName(user.getShopName());
222 224 }
223 225  
224 226  
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/SalaryPoolCommonService.java
  View file @4581232
... ... @@ -86,6 +86,8 @@ public class SalaryPoolCommonService {
86 86 salaryPool.setStaffStatus(user.getStaffStatus());
87 87 salaryPool.setOriginStaffStatus(user.getOriginStaffStatus());
88 88 salaryPool.setLeaveDate(user.getLeaveDate());
  89 + //2024年4月25日处理门店数据
  90 + salaryPool.setShopName(user.getShopName());
89 91 return salaryPool;
90 92 }
91 93  
... ...