|
@ -116,7 +116,7 @@ public class BaseEvaluateScoreService extends BaseJpaService<BaseEvaluateScoreDO
|
|
|
if (nowScore > oldScore){
|
|
|
if (oldScore == 0){
|
|
|
object.put("trend",1);
|
|
|
object.put("percentage","100%");
|
|
|
object.put("percentage",nowScore.toString());
|
|
|
}else {
|
|
|
Double difScore = nowScore - oldScore;
|
|
|
String percentage = getPercentage((float) (difScore.intValue()), (float) oldScore.intValue());
|
|
@ -124,10 +124,15 @@ public class BaseEvaluateScoreService extends BaseJpaService<BaseEvaluateScoreDO
|
|
|
object.put("percentage",percentage);
|
|
|
}
|
|
|
}else if (nowScore < oldScore){
|
|
|
Double difScore = oldScore - nowScore;
|
|
|
String percentage = getPercentage((float) (difScore.intValue()), (float) oldScore.intValue());
|
|
|
object.put("trend",-1);
|
|
|
object.put("percentage",percentage);
|
|
|
if (nowScore == 0){
|
|
|
object.put("trend",-1);
|
|
|
object.put("percentage",oldScore.toString());
|
|
|
}else {
|
|
|
Double difScore = oldScore - nowScore;
|
|
|
String percentage = getPercentage((float) (difScore.intValue()), (float) oldScore.intValue());
|
|
|
object.put("trend",-1);
|
|
|
object.put("percentage",percentage);
|
|
|
}
|
|
|
}else {
|
|
|
String percentage = "0%";
|
|
|
object.put("trend",0);
|