Merge remote-tracking branch 'origin/master'

data-collect-server/src/main/java/com/zq/datacollect/service/BigScreenService.java

@@ -49,7 +49,7 @@ public class BigScreenService {
                 List<Map<String, Object>> mapList = jdbcTemplate.queryForList("SELECT '市总'as dept,mx.`建设进度状态` as jsjd, COUNT(1) as typeCount FROM qsdsjfljdmxsjmx  mx  GROUP BY  mx.`建设进度状态`");
                 dataMap.put("mapList", mapList);
             } else {
-                List<Map<String, Object>> mapList = jdbcTemplate.queryForList("SELECT mx.`部门` as dept,mx.`建设进度状态` as jsjd, COUNT(1) as typeCount FROM qsdsjfljdmxsjmx  mx  WHERE mx.`部门` like CONCAT('%','" + diqu + "','%') GROUP BY  mx.`建设进度状态`");
+                List<Map<String, Object>> mapList = jdbcTemplate.queryForList("SELECT mx.`部门` as dept,mx.`建设进度状态` as jsjd, COUNT(1) as typeCount FROM qsdsjfljdmxsjmx  mx  WHERE mx.`部门` like CONCAT('%','" + diqu + "','%') GROUP BY  mx.`建设进度状态`,mx.`部门`");
                 dataMap.put("mapList", mapList);
             }
             objects.add(dataMap);