diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/job/biz/RankingBiz.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/job/biz/RankingBiz.java index 1df3b73..6fdb280 100644 --- a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/job/biz/RankingBiz.java +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/job/biz/RankingBiz.java @@ -438,7 +438,7 @@ public class RankingBiz { * @param financeScore * @return */ - private double computeCombineScore(CompetitionTask task,Double examScore,double financeScore){ + private double computeCombineScore(CompetitionTask task,Double examScore,Double financeScore){ if(examScore == null){ examScore =0d; } @@ -446,6 +446,9 @@ public class RankingBiz { if(power == null){ power = 0L; } + if(financeScore == null){ + financeScore = 0D; + } double score = (examScore*power+financeScore*task.getFinancePower())/100; return score; } @@ -459,7 +462,7 @@ public class RankingBiz { * @return */ private double computeFinaceScore(CompetitionTask task,double userRatio,double baseRatio,double maxUserRatio){ -// double score = task.getFinanceBasePower() + ((userRatio - baseRatio) /(maxUserRatio - baseRatio))* task.getFinanceProfitPower(); +// double score = task.getFinanceBasePower() + ((userRatio - baseRatio) /(maxUserRatio - baseRatio))* task.getFinancegetFinanceProfitPowerProfitPower(); double score = task.getFinanceProfitPower() + ((userRatio - baseRatio) /(maxUserRatio - baseRatio))* task.getFinanceBasePower(); return score; } diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/repository/CompetitionMemberDao.java b/tz/competition/competition-service/src/main/java/com/tz/platform/repository/CompetitionMemberDao.java index 2aa8216..7bcc08b 100644 --- a/tz/competition/competition-service/src/main/java/com/tz/platform/repository/CompetitionMemberDao.java +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/repository/CompetitionMemberDao.java @@ -43,14 +43,17 @@ public interface CompetitionMemberDao extends JpaRepository