Commit a7b52619 authored by licc's avatar licc

最大进步奖优化

parent 35eb90ef
...@@ -402,6 +402,7 @@ public class DayTaskServiceImpl implements DayTaskService { ...@@ -402,6 +402,7 @@ public class DayTaskServiceImpl implements DayTaskService {
} }
teamVo.setGrowthRate(growthRate); teamVo.setGrowthRate(growthRate);
double monthPerformance; double monthPerformance;
assert teamPerformance != null;
if (null == teamPerformance.getMonthTeamPerformance()) { if (null == teamPerformance.getMonthTeamPerformance()) {
monthPerformance = 0.00; monthPerformance = 0.00;
} else { } else {
...@@ -557,7 +558,11 @@ public class DayTaskServiceImpl implements DayTaskService { ...@@ -557,7 +558,11 @@ public class DayTaskServiceImpl implements DayTaskService {
} else { } else {
progressPrize.setGrowthRate(teamVo.getGrowthRate()); progressPrize.setGrowthRate(teamVo.getGrowthRate());
progressPrize.setAwardMoney(income); progressPrize.setAwardMoney(income);
progressPrize.setGrowthRate(teamVo.getGrowthRate()); if (income > 0) {
progressPrize.setGrowthRate(teamVo.getGrowthRate());
} else {
progressPrize.setGrowthRate(0.0);
}
updateList.add(progressPrize); updateList.add(progressPrize);
} }
} }
...@@ -568,7 +573,7 @@ public class DayTaskServiceImpl implements DayTaskService { ...@@ -568,7 +573,7 @@ public class DayTaskServiceImpl implements DayTaskService {
//修改或保存最大进步奖信息 //修改或保存最大进步奖信息
// flag 1: 日定时任务 2:月定时任务 // flag 1: 日定时任务 2:月定时任务
int flag = 1; int flag = 1;
return accountManager.updateOrSavePrize(updateAccountList, prizes,addList,updateList, flag); return accountManager.updateOrSavePrize(updateAccountList, prizes, addList, updateList, flag);
} }
......
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