From aa890874f3f6ee7e88134493dc29705bc6fd89a3 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.25>
Date: 星期一, 22 十月 2018 16:24:27 +0800
Subject: [PATCH] 修改

---
 gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java |    4 +++-
 1 files changed, 3 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 c0b3de1..b8f1bb6 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -3478,7 +3478,7 @@
 	//鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗洓灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍,num涓瓨鏀緐id)
 	public List serchBattByStation(Object obj){
 		BattInf binf=(BattInf) obj;
-		String sql="select DISTINCT StationName,StationId,StationIP,FBSDeviceId,BattGroupName,BattGroupName1,BattGroupName2,MonCount,battgroupId,MonCapStd,MonVolStd,MonResStd,MonSerStd,BattProducer,BattInUseDate,GroupIndexInFBSDevice,Load_curr,DisCurrMax " +
+		String sql="select DISTINCT StationName,StationName1,StationName2,StationId,StationIP,FBSDeviceId,BattGroupName,BattGroupName1,BattGroupName2,MonCount,battgroupId,MonCapStd,MonVolStd,MonResStd,MonSerStd,BattProducer,BattInUseDate,GroupIndexInFBSDevice,Load_curr,DisCurrMax " +
 				"from db_battinf.tb_battinf  where StationName1 like ? and StationName2 like ?  and  StationName like ?  ";
 	    //鏈烘埧id
 		String idSqlT=" and  Stationid like ? ";
@@ -3500,6 +3500,8 @@
 					while (rs.next()) {
 						BattInf batt = new BattInf();
 						batt.setStationName(rs.getString("stationName"));
+						batt.setStationName1(rs.getString("stationName1"));
+						batt.setStationName2(rs.getString("stationName2"));
 						batt.setStationId(rs.getString("StationId"));
 						batt.setStationIp(rs.getString("StationIP"));
 						batt.setBattGroupName(rs.getString("BattGroupName").trim());

--
Gitblit v1.9.1