线路公里、能耗与统计指标接口：添加早晚高峰计划班次与实际班次。

娄高锋
1 parent 8a2900b0
Showing 1 changed file with 13 additions and 1 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
@@ -3829,7 +3829,8 @@ public class BigscreenService {
 				+ " jhzgl,sjzgl,jhyylc,sjyylc,jhyylcz,jhkslc,sjkslc,jhkslcz,"
 				+ " jhssgfbcs,sjgfbcs,jhgfbcsz,jhssdgbcs,sjdgbcs,jhdgbcsz,"
     			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
-				+ " jhszfcs,sjszfczds,szfczdl,create_date"
+				+ " jhszfcs,sjszfczds,szfczdl,create_date,"
+    			+ " jhzgfbcz,jhzgfbcss,sjzgfbc,jhwgfbcz,jhwgfbcss,sjwgfbc"
 				+ " from bsth_c_calc_count "
 				+ " where date = ? ";
@@ -3880,6 +3881,13 @@ public class BigscreenService {
 						m.put("sjszfczds", rs.getString("sjszfczds"));
 						m.put("szfczdl", rs.getString("szfczdl"));
+						m.put("jhzgfbcz", rs.getString("jhzgfbcz"));
+						m.put("jhzgfbc", rs.getString("jhzgfbcss"));
+						m.put("sjzgfbc", rs.getString("sjzgfbc"));
+						m.put("jhwgfbcz", rs.getString("jhwgfbcz"));
+						m.put("jhwgfbc", rs.getString("jhwgfbcss"));
+						m.put("sjwgfbc", rs.getString("sjwgfbc"));
+						
 						Date date = new Date();
 						date.setTime(rs.getTimestamp("create_date").getTime());
 						m.put("createDate", sdf.format(date));
@@ -3973,6 +3981,10 @@ public class BigscreenService {
 				resMap.put("jhbc", t.get("jhbc").toString());
 				resMap.put("sjbc", t.get("sjbc").toString());
 				resMap.put("bczxl", t.get("bczxl").toString());
+				resMap.put("jhbcZgf", t.get("jhzgfbc").toString());
+				resMap.put("jhbcWgf", t.get("jhwgfbc").toString());
+				resMap.put("sjbcZgf", t.get("sjzgfbc").toString());
+				resMap.put("sjbcWgf", t.get("sjwgfbc").toString());
 				resMap.put("jhsmbc", t.get("jhsmbcs").toString());
 				resMap.put("sjsmzd", t.get("sjsmbczds").toString());
 				resMap.put("smbzdl", t.get("smbczdl").toString());