From a50eeca38aac03ba7a4fb9f27f73133936b8597a Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 05 十二月 2018 17:38:10 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
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 4182f60..eee0176 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -179,7 +179,7 @@
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,"
+ "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 " +
+ ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,Load_curr,install_user,DisCurrMax,station_phone,Station_install " +
" From db_battinf.tb_battinf " +
" Where StationName like ? and StationName1 like ? and StationName2 like ? and StationName5 like ? " +
" order by StationId " +
@@ -227,6 +227,7 @@
binf.setInstall_user(rs.getString("install_user"));
binf.setDisCurrMax(rs.getFloat("disCurrMax"));
binf.setStation_phone(rs.getString("station_phone"));
+ binf.setStation_install(rs.getInt("station_install"));
list.add(binf);
}
--
Gitblit v1.9.1