Commit 71591655 by wenyang

1、活动量分值详情显示错误

 2、战队销售业绩预测(预计)列表数据显示错误
parent 004afafe
...@@ -2704,7 +2704,10 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service. ...@@ -2704,7 +2704,10 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
defaultPremium = defaultPremium.add(leadsAssigneds.getFyp()); defaultPremium = defaultPremium.add(leadsAssigneds.getFyp());
} }
} }
Double achievementRate = defaultCommission.divide(quarterGoal, 4, BigDecimal.ROUND_HALF_UP).doubleValue(); Double achievementRate = 0D;
if(quarterGoal.compareTo(BigDecimal.ZERO)!=0){
achievementRate = defaultCommission.divide(quarterGoal, 4, BigDecimal.ROUND_HALF_UP).doubleValue();
}
info.setPractitionerId(praId); info.setPractitionerId(praId);
info.setName(practitionerIdToName.get(praId)); info.setName(practitionerIdToName.get(praId));
info.setPieces(defaultPieces); info.setPieces(defaultPieces);
...@@ -2756,7 +2759,10 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service. ...@@ -2756,7 +2759,10 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
info.setCommission(defaultCommission.doubleValue()); info.setCommission(defaultCommission.doubleValue());
if (!mktLeadsGoalsList.isEmpty()) { if (!mktLeadsGoalsList.isEmpty()) {
MktLeadsGoals leadsGoals = mktLeadsGoalsList.get(0); MktLeadsGoals leadsGoals = mktLeadsGoalsList.get(0);
Double achievementRate = defaultCommission.divide(BigDecimal.valueOf(leadsGoals.getCommission()), 4, BigDecimal.ROUND_HALF_UP).doubleValue(); Double achievementRate = 0D;
if(leadsGoals.getCommission() != null && leadsGoals.getCommission() > 0){
achievementRate = defaultCommission.divide(BigDecimal.valueOf(leadsGoals.getCommission()), 4, BigDecimal.ROUND_HALF_UP).doubleValue();
}
info.setAchievementRate(achievementRate); info.setAchievementRate(achievementRate);
} }
infos.add(info); infos.add(info);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment