收费站进步退步前5名未显示bug

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

@@ -1196,12 +1196,12 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		}
 
 //		Map<Long, StatisticsBo> masterMap = getMasterNumAndScore(obj.getMth());
-//		for (StatisticsBean statisticsBean : userLostScoreInfoList) {
-//			if (statisticBoMap.containsKey(statisticsBean.getUser_id())) {
-//				StatisticsBean tmp = statisticBoMap.get(statisticsBean.getUser_id());
-//				tmp.setAll_check_score(statisticsBean.getAll_check_score());
-//				tmp.setChecked_num(statisticsBean.getChecked_num());
-//			}
+		for (StatisticsBean statisticsBean : userLostScoreInfoList) {
+			if (statisticBoMap.containsKey(statisticsBean.getUser_id())) {
+				StatisticsBean tmp = statisticBoMap.get(statisticsBean.getUser_id());
+				tmp.setAll_check_score(statisticsBean.getAll_check_score());
+				tmp.setChecked_num(statisticsBean.getChecked_num());
+			}
 //			// 计算班长总扣分和总稽查次数
 //			if (masterMap.get(statisticsBean.getUser_id()) != null) {
 //				StatisticsBean tmp = statisticBoMap.get(statisticsBean.getUser_id());
@@ -1210,7 +1210,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 //				tmp.setAll_check_score(statisticsBean.getAll_check_score() + (msb!=null?msb.getCheck_all_m_score():0));
 //				tmp.setChecked_num(statisticsBean.getChecked_num() + (msb!=null?msb.getChecked_m_num():0));
 //			}
-//		}
+		}
 
 		List<StatisticsBean> lists = new ArrayList<>();
 		for (StatisticsBean bean : statisticBoMap.values()) {

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