|
|
@@ -1905,23 +1905,24 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
|
|
|
StatisticsBean value = station.getValue();
|
|
|
// 设置总平均扣分
|
|
|
if (value.getCompany_check_num() > 0) {
|
|
|
- avg += value.getCompany_total_score() / value.getCompany_check_num();
|
|
|
+ avg += value.getCompany_total_score() / value.getCompany_check_num()/4.0;
|
|
|
}
|
|
|
if (value.getThird_check_num() > 0) {
|
|
|
- avg += value.getThird_total_score() / value.getThird_check_num();
|
|
|
+ avg += value.getThird_total_score() / value.getThird_check_num()/4.0;
|
|
|
}
|
|
|
if (value.getSpecial_check_num() > 0) {
|
|
|
- avg += value.getSpecial_total_score() / value.getSpecial_check_num();
|
|
|
+ avg += value.getSpecial_total_score() / value.getSpecial_check_num()/4.0;
|
|
|
}
|
|
|
if (value.getOnsite_check_num() > 0) {
|
|
|
- avg += value.getOnsite_total_score() / value.getOnsite_check_num();
|
|
|
+ avg += value.getOnsite_total_score() / value.getOnsite_check_num()/4.0;
|
|
|
}
|
|
|
if (value.getData_check_num() > 0) {
|
|
|
- avg += value.getData_total_score() / value.getData_check_num();
|
|
|
+ avg += value.getData_total_score() / value.getData_check_num()/4.0;
|
|
|
}
|
|
|
- value.setCheck_total_avg(df.format(avg / value.getPeople_num()));
|
|
|
+// value.setCheck_total_avg(df.format(avg / value.getPeople_num()));
|
|
|
+ value.setCheck_total_avg(df.format(avg ));
|
|
|
// 设置平均得分
|
|
|
- Float score_avg = (1000 - Float.valueOf(df.format(avg / value.getPeople_num())));
|
|
|
+ Float score_avg = (1000 - Float.valueOf(df.format(avg )));
|
|
|
value.setScore_avg(score_avg.toString());
|
|
|
}
|
|
|
List<StatisticsBean> sortList = new ArrayList<>(mapStationInfos.values());
|