Skip to content

Y
yd-backend
Commit 8b9a3f3c by yao.xiao
Options

解决bug

parent ac886406
Showing with 29 additions and 22 deletions
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java
...@@ -1580,10 +1580,15 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service. ...@@ -1580,10 +1580,15 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
} }
//查询其团队天,周,月总分 //查询其团队天,周,月总分
HashMap<String,BigDecimal> totalStatistics = mktLeadsAssignedTrackDALService.totalStatisticsForTeam(practitionerIds); HashMap<String,BigDecimal> totalStatistics = mktLeadsAssignedTrackDALService.totalStatisticsForTeam(practitionerIds);
//总分除以人数得到均分 Double scoreDayAverage = 0D;
Double scoreDayAverage = getScoreAverage(totalStatistics.get("scoreToday"),practitionerNum); Double scoreWeekAverage= 0D;
Double scoreWeekAverage= getScoreAverage(totalStatistics.get("scoreWeek"),practitionerNum); Double scoreMonthAverage= 0D;
Double scoreMonthAverage= getScoreAverage(totalStatistics.get("scoreMonth"),practitionerNum); if (totalStatistics != null){
//总分除以人数得到均分
scoreDayAverage = getScoreAverage(totalStatistics.get("scoreToday"),practitionerNum);
scoreWeekAverage= getScoreAverage(totalStatistics.get("scoreWeek"),practitionerNum);
scoreMonthAverage= getScoreAverage(totalStatistics.get("scoreMonth"),practitionerNum);
}
//计算此团队一周增加的商机数 ag_mkt_leads_assigneds //计算此团队一周增加的商机数 ag_mkt_leads_assigneds
Integer opportunitiesNum = mktLeadsAssignedsDALService.countPractitionerIdsAndThisWeek(practitionerIds); Integer opportunitiesNum = mktLeadsAssignedsDALService.countPractitionerIdsAndThisWeek(practitionerIds);
...@@ -1603,15 +1608,17 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service. ...@@ -1603,15 +1608,17 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
responseVO.setScoreWeekAverage(scoreWeekAverage); responseVO.setScoreWeekAverage(scoreWeekAverage);
responseVO.setScoreMonthAverage(scoreMonthAverage); responseVO.setScoreMonthAverage(scoreMonthAverage);
responseVO.setOpportunitiesNum(opportunitiesNum); responseVO.setOpportunitiesNum(opportunitiesNum);
responseVO.setPremiumMonth(CommonUtil.isNullOrZero(performanceForecast.get("totalFYPMonth"))?0:performanceForecast.get("totalFYPMonth").doubleValue()); if (performanceForecast != null){
responseVO.setCommissionMonth(CommonUtil.isNullOrZero(performanceForecast.get("totalFYCMonth"))?0:performanceForecast.get("totalFYCMonth").doubleValue()); responseVO.setPremiumMonth(CommonUtil.isNullOrZero(performanceForecast.get("totalFYPMonth"))?0:performanceForecast.get("totalFYPMonth").doubleValue());
responseVO.setPiecesMonth(CommonUtil.isNullOrZero(performanceForecast.get("totalPiecesMonth"))?0:performanceForecast.get("totalPiecesMonth").doubleValue()); responseVO.setCommissionMonth(CommonUtil.isNullOrZero(performanceForecast.get("totalFYCMonth"))?0:performanceForecast.get("totalFYCMonth").doubleValue());
responseVO.setPremiumQuarter(CommonUtil.isNullOrZero(performanceForecast.get("totalFYPQuarter"))?0:performanceForecast.get("totalFYPQuarter").doubleValue()); responseVO.setPiecesMonth(CommonUtil.isNullOrZero(performanceForecast.get("totalPiecesMonth"))?0:performanceForecast.get("totalPiecesMonth").doubleValue());
responseVO.setCommissionQuarter(CommonUtil.isNullOrZero(performanceForecast.get("totalFYCQuarter"))?0:performanceForecast.get("totalFYCQuarter").doubleValue()); responseVO.setPremiumQuarter(CommonUtil.isNullOrZero(performanceForecast.get("totalFYPQuarter"))?0:performanceForecast.get("totalFYPQuarter").doubleValue());
responseVO.setPiecesQuarter(CommonUtil.isNullOrZero(performanceForecast.get("totalPiecesQuarter"))?0:performanceForecast.get("totalPiecesQuarter").doubleValue()); responseVO.setCommissionQuarter(CommonUtil.isNullOrZero(performanceForecast.get("totalFYCQuarter"))?0:performanceForecast.get("totalFYCQuarter").doubleValue());
responseVO.setPremiumYear(CommonUtil.isNullOrZero(performanceForecast.get("totalFYPYear"))?0:performanceForecast.get("totalFYPYear").doubleValue()); responseVO.setPiecesQuarter(CommonUtil.isNullOrZero(performanceForecast.get("totalPiecesQuarter"))?0:performanceForecast.get("totalPiecesQuarter").doubleValue());
responseVO.setCommissionYear(CommonUtil.isNullOrZero(performanceForecast.get("totalFYCYear"))?0:performanceForecast.get("totalFYCYear").doubleValue()); responseVO.setPremiumYear(CommonUtil.isNullOrZero(performanceForecast.get("totalFYPYear"))?0:performanceForecast.get("totalFYPYear").doubleValue());
responseVO.setPiecesYear(CommonUtil.isNullOrZero(performanceForecast.get("totalPiecesYear"))?0:performanceForecast.get("totalPiecesYear").doubleValue()); responseVO.setCommissionYear(CommonUtil.isNullOrZero(performanceForecast.get("totalFYCYear"))?0:performanceForecast.get("totalFYCYear").doubleValue());
responseVO.setPiecesYear(CommonUtil.isNullOrZero(performanceForecast.get("totalPiecesYear"))?0:performanceForecast.get("totalPiecesYear").doubleValue());
}
responseVO.setAchievementRateYear(CommonUtil.isNullOrZero(achievementRateMap.get("achievementRateYear"))?0D: achievementRateMap.get("achievementRateYear")); responseVO.setAchievementRateYear(CommonUtil.isNullOrZero(achievementRateMap.get("achievementRateYear"))?0D: achievementRateMap.get("achievementRateYear"));
responseVO.setAchievementRateQuarter(CommonUtil.isNullOrZero(achievementRateMap.get("achievementRateQuarter"))?0D:achievementRateMap.get("achievementRateQuarter")); responseVO.setAchievementRateQuarter(CommonUtil.isNullOrZero(achievementRateMap.get("achievementRateQuarter"))?0D:achievementRateMap.get("achievementRateQuarter"));
responseVO.setAchievementRateMonth(CommonUtil.isNullOrZero(achievementRateMap.get("achievementRateMonth"))?0D:achievementRateMap.get("achievementRateMonth")); responseVO.setAchievementRateMonth(CommonUtil.isNullOrZero(achievementRateMap.get("achievementRateMonth"))?0D:achievementRateMap.get("achievementRateMonth"));
......
yd-api/src/main/java/com/yd/api/practitioner/vo/salestarget/TeamActionsAverageQueryResponseVO.java
...@@ -25,39 +25,39 @@ public class TeamActionsAverageQueryResponseVO { ...@@ -25,39 +25,39 @@ public class TeamActionsAverageQueryResponseVO {
/** /**
* 月保费 * 月保费
*/ */
private Double premiumMonth; private Double premiumMonth = 0D;
/** /**
* 月佣金 * 月佣金
*/ */
private Double commissionMonth; private Double commissionMonth = 0D;
/** /**
* 月件数 * 月件数
*/ */
private Double piecesMonth; private Double piecesMonth = 0D;
/** /**
* 季度保费 * 季度保费
*/ */
private Double premiumQuarter; private Double premiumQuarter = 0D;
/** /**
* 季度佣金 * 季度佣金
*/ */
private Double commissionQuarter; private Double commissionQuarter = 0D;
/** /**
* 季度件数 * 季度件数
*/ */
private Double piecesQuarter; private Double piecesQuarter = 0D;
/** /**
* 年保费 * 年保费
*/ */
private Double premiumYear; private Double premiumYear = 0D;
/** /**
* 年佣金 * 年佣金
*/ */
private Double commissionYear; private Double commissionYear = 0D;
/** /**
* 年件数 * 年件数
*/ */
private Double piecesYear; private Double piecesYear = 0D;
/** /**
* 年完成率 * 年完成率
*/ */
......
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