营运出车率去掉了sql的group by

娄高锋
1 parent ce78196f
Showing 1 changed file with 49 additions and 20 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
@@ -735,6 +735,7 @@ public class FormsServiceImpl implements FormsService {
 	@Override
 	public List<Turnoutrate> turnoutrate(Map<String, Object> map) {
+		List<Turnoutrate> resList = new ArrayList<Turnoutrate>();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
 		Date d = null;
@@ -752,22 +753,24 @@ public class FormsServiceImpl implements FormsService {
 		rq = rq2 + "-" + rq3;
 		String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,b.warrant_car,a.bc_type from "
-				+ "  (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
-				+ "   from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"+ map.get("startDate").toString() + "'  "
+				+ " (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
+				+ " from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"+ map.get("startDate").toString() + "'  "
 				+ " and '" + map.get("endDate").toString() + "'  and xl_bm='"+ map.get("line").toString() + "' "
 				+ " AND gs_bm is not null "
 				+ " AND bc_type NOT IN ('in', 'out')"
 				+ " and gs_bm='"+ map.get("gsdmTurn").toString() + "'"
 				+ " and fgs_bm='"+ map.get("fgsdmTurn").toString() + "'"
-				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
+//				+ " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type "
+				+ " ) a left JOIN ("
 				+ " SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl,t.warrant_car   "
-				+ " from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type  from bsth_c_s_sp_info_real	 "
+				+ " from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type  from bsth_c_s_sp_info_real "
 				+ " where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '" + map.get("startDate").toString() + "'  and '"
 				+ map.get("endDate").toString() + "'  and xl_bm='" + map.get("line").toString()
 				+ "' AND gs_bm is not null "
 				+ " AND bc_type NOT IN ('in', 'out')"
-				+ "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type) b ON  t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "
-				+ "  a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
+//				+ " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type "
+				+ " ) b ON  t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "
+				+ " a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
 		List<Turnoutrate> list = jdbcTemplate.query(sql, new RowMapper<Turnoutrate>() {
 			@Override
@@ -782,6 +785,8 @@ public class FormsServiceImpl implements FormsService {
 				String result1 = numberFormat.format((float) scl / (float) jcl * 100);
 				String result2 = numberFormat.format((float) sbc / (float) jbc * 100);
 				tu.setRq(rq);
+				if(arg0.getString("gs_name") == null || arg0.getString("gs_name").trim().length() == 0)
+					return tu;
 				tu.setGs(arg0.getString("gs_name").toString());
 				tu.setZhgs(arg0.getString("fgs_name").toString());
 //				tu.setXl(arg0.getString("xlgs")!=null&&arg0.getString("xlgs").trim().length()!=0?arg0.getString("xlgs"):"0");
@@ -801,14 +806,20 @@ public class FormsServiceImpl implements FormsService {
 			}
 		});
+		
+		for(Turnoutrate t : list){
+			if(t.getGs() != null && t.getGs().trim().length() != 0)
+				resList.add(t);
+		}
-		return list;
+		return resList;
 	}
 	//班次执行率统计表
 	@Override
 	public List<Executionrate> executionrate(Map<String, Object> map) {
+		List<Executionrate> resList = new ArrayList<Executionrate>();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
 		Date d = null;
@@ -826,20 +837,22 @@ public class FormsServiceImpl implements FormsService {
 		rq = rq2 + "-" + rq3;
 		String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.xl_name,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,a.bc_type from "
-				+ "  (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
-				+ "   from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
+				+ " (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
+				+ " from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
 				+ map.get("startDate").toString() + "'  and '" + map.get("endDate").toString() + "'  and xl_bm='"
 				+ map.get("line").toString() + "'   AND gs_bm is not null  AND bc_type NOT IN ('in', 'out')"
 				+ " and gs_bm='"+ map.get("gsdmEcecut").toString() + "'"
 				+ " and fgs_bm='"+ map.get("fgsdmEcecut").toString() + "'"
-				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
+//				+ " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type "
+				+ " ) a left JOIN ("
 				+ "SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.xl_name,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl  "
 				+ "from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,xl_name,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type  from bsth_c_s_sp_info_real	 "
 				+ "where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '" + map.get("startDate").toString() + "'  and '"
 				+ map.get("endDate").toString() + "'  and xl_bm='" + map.get("line").toString()
 				+ "' AND gs_bm is not null AND bc_type NOT IN ('in', 'out') "
-				+ "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type) b ON  t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "
-				+ "  a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
+//				+ " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type"
+				+ " ) b ON  t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "
+				+ " a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
 		List<Executionrate> list = jdbcTemplate.query(sql, new RowMapper<Executionrate>() {
 			@Override
@@ -854,6 +867,8 @@ public class FormsServiceImpl implements FormsService {
 				String result1 = numberFormat.format((float) scl / (float) jcl * 100);
 				String result2 = numberFormat.format((float) sbc / (float) jbc * 100);
 				tu.setRq(rq);
+				if(arg0.getString("gs_name") == null || arg0.getString("gs_name").trim().length() == 0)
+					return tu;
 				tu.setGs(arg0.getString("gs_name").toString());
 				tu.setZhgs(arg0.getString("fgs_name").toString());
 //				tu.setXl(arg0.getString("xlgs")!=null&&arg0.getString("xlgs").trim().length()!=0?arg0.getString("xlgs"):"0");//这个是根据公司判断线路有几条
@@ -874,13 +889,19 @@ public class FormsServiceImpl implements FormsService {
 			}
 		});
+		
+		for(Executionrate e : list){
+			if(e.getGs() != null && e.getGs().trim().length() != 0)
+				resList.add(e);
+		}
-		return list;
+		return resList;
 	}
 	// 营运线路名称统计表
 	@Override
 	public List<Allline> allline(Map<String, Object> map) {
+		List<Allline> resList = new ArrayList<Allline>();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
 		Date d = null;
@@ -900,13 +921,14 @@ public class FormsServiceImpl implements FormsService {
 		rq = rq2 + "-" + rq3;
 		String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.xl_name,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,a.bc_type from "
-				+ "  (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
-				+ "   from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
+				+ " (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
+				+ " from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
 				+ map.get("startDate").toString() + "'  and '" + map.get("endDate").toString() + "'  and xl_bm='"
 				+ map.get("line").toString() + "'   AND gs_bm is not null  AND bc_type NOT IN ('in', 'out') "
 				+ " and gs_bm='"+ map.get("gsdmAllline").toString() + "'"
 				+ " and fgs_bm='"+ map.get("fgsdmAllline").toString() + "'"
-				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
+//				+ " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type "
+				+ " ) a left JOIN ("
 				+ "SELECT  COUNT(*"
 				+ ") as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b."
 				+ "xl_name,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl   "
@@ -915,9 +937,9 @@ public class FormsServiceImpl implements FormsService {
 				+ map.get("endDate").toString() + "'  and xl_bm='" + map.get
 				("line").toString()
 				+ "' AND gs_bm is not null  AND bc_type NOT IN ('in', 'out')"
-				+ "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type) b ON  t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "
-				+ "  a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
-		System.out.println(sql);
+//				+ " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type"
+				+ " ) b ON  t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "
+				+ " a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
 		List<Allline> list = jdbcTemplate.query(sql, new RowMapper<Allline>() {
 			@Override
@@ -932,6 +954,8 @@ public class FormsServiceImpl implements FormsService {
 				String result1 = numberFormat.format((float) scl / (float) jcl * 100);
 				String result2 = numberFormat.format((float) sbc / (float) jbc * 100);
 				tu.setRq(rq);
+				if(arg0.getString("gs_name") == null || arg0.getString("gs_name").trim().length() == 0)
+					return tu;
 				tu.setGs(arg0.getString("gs_name").toString());
 				tu.setZhgs(arg0.getString("fgs_name").toString());
 				tu.setXl(arg0.getString("xl_name"));
@@ -951,7 +975,12 @@ public class FormsServiceImpl implements FormsService {
 			}
 		});
-		return list;
+		for(Allline a : list){
+			if(a.getGs() != null && a.getGs().trim().length() != 0)
+				resList.add(a);
+		}
+		
+		return resList;
 	}
 	@Override