From 581d48c932a26b02feacef0e65634736c2cfb265 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期五, 07 十二月 2018 14:47:06 +0800
Subject: [PATCH] 电池组信息配置修改

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

diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 95f876a..992983c 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -199,7 +199,7 @@
 		Page page=bmd.getPage();
 		Connection conn= DBUtil.getConn();
 		String numberSql=" SELECT FOUND_ROWS() number";
-		String sql="select SQL_CALC_FOUND_ROWS distinct(StationId),StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,FbsDeviceIp_YM,FbsDeviceIp_WG,FbsDeviceIp,"
+		String sql="select SQL_CALC_FOUND_ROWS distinct(StationId),StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,FbsDeviceIp_YM,FbsDeviceIp_WG,FbsDeviceIp,"
 				+ "FBSDeviceName,GroupIndexInFBSDevice,battgroupId,BattGroupNum,BattGroupName,FloatVolLevel,OfflineVolLevel,BattFloatCurrent" +
 				 ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,Load_curr,install_user,DisCurrMax,station_phone,Station_install  " +
 				 " From db_battinf.tb_battinf " +
@@ -216,6 +216,7 @@
 					while (rs.next()) {
 						BattInf binf = new BattInf();
 						binf.setStationId(rs.getString("stationId"));
+						binf.setStationName(rs.getString("stationName"));
 						binf.setStationName1(rs.getString("stationName1"));
 						binf.setStationName2(rs.getString("stationName2"));
 						binf.setStationName3(rs.getString("stationName3"));

--
Gitblit v1.9.1