From fb8529359bbae75a662fbf32086b296b7a854163 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.25>
Date: 星期二, 30 十月 2018 16:31:06 +0800
Subject: [PATCH] 实时左下角加区县

---
 gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java
index 8f467d3..067a544 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java
@@ -126,7 +126,7 @@
 	 //娴嬭瘯鏁版嵁鈥斺�斿疄鏃舵煡璇腑宸︿笅瑙掔殑鍏呮斁鐢电粺璁�(鐢ㄦ埛绠$悊鐨勬満鎴�)
 	public List serchDisOrChargrNew(Object obj){
 		User_inf uinf=(User_inf) obj;
-		String sql=" SELECT  distinct db_ram_db.tb_batt_rtstate.battgroupid,batt_test_type,stationid,fbsdeviceid,stationName,stationName1,stationName2,stationName3 " +
+		String sql=" SELECT  distinct db_ram_db.tb_batt_rtstate.battgroupid,batt_test_type,stationid,fbsdeviceid,stationName,stationName1,stationName2,stationName3,stationName5 " +
 				"  from db_ram_db.tb_batt_rtstate,db_battinf.tb_battinf " +
 				"  where  batt_test_type IN(2,3) " +
 				"  and db_ram_db.tb_batt_rtstate.battgroupid=db_battinf.tb_battinf.BattGroupId " +
@@ -154,6 +154,7 @@
 						bstate.setStationName1(rs.getString("stationName1"));
 						bstate.setStationName2(rs.getString("stationName2"));
 						bstate.setStationName3(rs.getString("stationName3"));
+						bstate.setStationName5(rs.getString("stationName5"));
 						if(rs.getInt("batt_test_type")==3){
 							dischar++;
 						}else if(rs.getInt("batt_test_type")==2){

--
Gitblit v1.9.1