配档驾驶员去重

娄高锋
1 parent 565ee8d1
Showing 1 changed file with 3 additions and 12 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
@@ -656,9 +656,9 @@ public class BigscreenService {
         	attList.add(att);
     	}
-    	String gpLineSql = "select p.company_code, count(1) jsy, sum(count) line"
-    			+ " from (select e.jsy, e.xl, count(1) count from bsth_c_s_ecinfo e"
-    			+ " where e.is_cancel = 0 group by e.jsy, e.xl ) a"
+    	String gpLineSql = "select p.company_code, count(1) jsy"
+    			+ " from (select e.jsy from bsth_c_s_ecinfo e"
+    			+ " where e.is_cancel = 0 group by e.jsy) a"
     			+ " left join bsth_c_personnel p on a.jsy = p.id"
     			+ " group by p.company_code";
     	List<Map<String, Object>> ecList=jdbcTemplate.query(gpLineSql,
@@ -668,7 +668,6 @@ public class BigscreenService {
 						Map<String, Object> m=new HashMap<String,Object>();
 						m.put("company", rs.getString("company_code"));
 						m.put("jsy", rs.getString("jsy"));
-						m.put("line", rs.getString("line"));
 						return m;
 					}
 				});
@@ -677,39 +676,31 @@ public class BigscreenService {
     	Map<String, Object> ygMap = new HashMap<String, Object>();
     	ygMap.put("company", "杨高");
     	ygMap.put("jsy", "0");
-    	ygMap.put("line", "0");
     	Map<String, Object> snMap = new HashMap<String, Object>();
     	snMap.put("company", "上南");
     	snMap.put("jsy", "0");
-    	snMap.put("line", "0");
     	Map<String, Object> jgMap = new HashMap<String, Object>();
     	jgMap.put("company", "金高");
     	jgMap.put("jsy", "0");
-    	jgMap.put("line", "0");
     	Map<String, Object> nhMap = new HashMap<String, Object>();
     	nhMap.put("company", "南汇");
     	nhMap.put("jsy", "0");
-    	nhMap.put("line", "0");
     	for(Map<String, Object> m : ecList){		//顺序：杨高，上南，金高，南汇
     		if("05".equals(m.get("company").toString())){
 //    			m.put("company", "杨高");
     			ygMap.put("jsy", m.get("jsy").toString());
-    			ygMap.put("line", m.get("line").toString());
     		}
     		if("55".equals(m.get("company").toString())){
 //    			m.put("company", "上南");
     			snMap.put("jsy", m.get("jsy").toString());
-    			snMap.put("line", m.get("line").toString());
     		}
     		if("22".equals(m.get("company").toString())){
 //    			m.put("company", "金高");
     			jgMap.put("jsy", m.get("jsy").toString());
-    			jgMap.put("line", m.get("line").toString());
     		}
     		if("26".equals(m.get("company").toString())){
 //    			m.put("company", "南汇");
     			nhMap.put("jsy", m.get("jsy").toString());
-    			nhMap.put("line", m.get("line").toString());
     		}
     	}
     	jsyList.add(ygMap);