bug :次数不对

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/StatisticsServiceImpl.java

@@ -1883,19 +1883,19 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			mapStationInfos.get(company_bean.getDept_id()).setCompany_total_score(company_bean.getAll_check_score());
 		}
 		for (StatisticsBean third_bean : third_beans) {
-			mapStationInfos.get(third_bean.getDept_id()).setThird_check_num(1);
+			mapStationInfos.get(third_bean.getDept_id()).setThird_check_num(third_bean.getChecked_num()>1?1:third_bean.getChecked_num());
 			mapStationInfos.get(third_bean.getDept_id()).setThird_total_score(third_bean.getCheck_total_score());
 		}
 		for (StatisticsBean special_bean : special_beans) {
-			mapStationInfos.get(special_bean.getDept_id()).setSpecial_check_num(1);
+			mapStationInfos.get(special_bean.getDept_id()).setSpecial_check_num(special_bean.getChecked_num());
 			mapStationInfos.get(special_bean.getDept_id()).setSpecial_total_score(special_bean.getCheck_total_score());
 		}
 		for (StatisticsBean onsite_bean : onsite_beans) {
-			mapStationInfos.get(onsite_bean.getDept_id()).setOnsite_check_num(1);
+			mapStationInfos.get(onsite_bean.getDept_id()).setOnsite_check_num(onsite_bean.getChecked_num()>1?1:onsite_bean.getChecked_num());
 			mapStationInfos.get(onsite_bean.getDept_id()).setOnsite_total_score(onsite_bean.getCheck_total_score());
 		}
 		for (StatisticsBean data_bean : data_beans) {
-			mapStationInfos.get(data_bean.getDept_id()).setData_check_num(1);
+			mapStationInfos.get(data_bean.getDept_id()).setData_check_num(data_bean.getChecked_num()>1?1:data_bean.getChecked_num());
 			mapStationInfos.get(data_bean.getDept_id()).setData_total_score(data_bean.getCheck_total_score());
 		}
 		// 计算出每个收费站的总平均扣分和平均得分
@@ -1905,6 +1905,10 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		for (Entry<Long, StatisticsBean> station : stationInfos) {
 			float avg = 0;
 			StatisticsBean value = station.getValue();
+			value.setThird_check_num(1);
+            value.setSpecial_check_num(1);
+            value.setOnsite_check_num(1);
+            value.setData_check_num(1);
 			// 设置总平均扣分
 			if (value.getCompany_check_num() > 0 || value.getThird_check_num() > 0) {
 				avg += (value.getCompany_total_score() +value.getThird_total_score())  /4.0/ (value.getCompany_check_num()+value.getThird_check_num());

VisualInspection_server/src/main/resources/application.properties

@@ -3,8 +3,8 @@ spring.thymeleaf.cache=false
 context.listener.classes=com.xintong.SystemInit
 
 #master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
-#master.datasource.url = jdbc:mysql://git.topm.win:6400/visualinspection?useUnicode=true&characterEncoding=utf-8
-master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://git.topm.win:6400/visualinspection?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
@@ -13,8 +13,8 @@ master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.x
 
 ## \u7528\u6237\u6570\u636E\u6E90\u914D\u7F6E
 #cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf8
-#cluster.datasource.url=jdbc:mysql://git.topm.win:6400/visualinspection?useUnicode=true&characterEncoding=utf8
-cluster.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
+cluster.datasource.url=jdbc:mysql://git.topm.win:6400/visualinspection?useUnicode=true&characterEncoding=utf8
+#cluster.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
 #cluster.datasource.url=jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root
@@ -62,8 +62,8 @@ spring.redis.host=git.topm.win
 #spring.redis.port=6379
 
 #spring.redis.port=7003
-#spring.redis.port=6401
-spring.redis.port=6380
+spring.redis.port=6401
+#spring.redis.port=6380
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
 spring.redis.password=xintong
 # \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09