小班成绩心得成绩从id168之后改为百分比
This commit is contained in:
@@ -1469,14 +1469,17 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
|
||||
if(classModel.getIsExperience()==1){
|
||||
BigDecimal experienceScore = new BigDecimal(map.get("experienceScore").toString());
|
||||
if (experienceScore.compareTo(new BigDecimal(0))!=0){
|
||||
double count = Math.ceil(classModel.getDays()/7);
|
||||
BigDecimal totalScore = new BigDecimal(staticScore*count);
|
||||
if (experienceScore.compareTo(totalScore)>0){
|
||||
experienceScore = new BigDecimal(classModel.getExperienceScore());
|
||||
}else {
|
||||
if (classEntity.getId()>168){
|
||||
double count = Math.ceil(classModel.getDays()/7);
|
||||
BigDecimal totalScore = new BigDecimal(staticScore*count);
|
||||
experienceScore = experienceScore.divide(totalScore,2, RoundingMode.HALF_UP);
|
||||
experienceScore = experienceScore.multiply(new BigDecimal(classModel.getExperienceScore()));
|
||||
experienceScore = experienceScore.setScale(2,RoundingMode.HALF_UP);
|
||||
}else {
|
||||
if (experienceScore.compareTo(new BigDecimal(classModel.getExperienceScore()))>-1){
|
||||
experienceScore = new BigDecimal(classModel.getExperienceScore());
|
||||
}
|
||||
experienceScore = experienceScore.setScale(2,RoundingMode.HALF_UP);
|
||||
}
|
||||
map.put("experienceScore",experienceScore);
|
||||
usualScore = usualScore.add(experienceScore);
|
||||
|
||||
Reference in New Issue
Block a user