From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/Ld9/LD9_setparamImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Ld9/LD9_setparamImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Ld9/LD9_setparamImpl.java
index 9a39c3e..b7926ef 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Ld9/LD9_setparamImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Ld9/LD9_setparamImpl.java
@@ -55,7 +55,7 @@
//鏍规嵁鏈烘埧淇℃伅鏌ヨ鍙傛暟
public List serchByCondition(Object obj) {
BattInf binf=(BattInf) obj;
- String sql="select db_battinf.tb_battinf.battgroupid,db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.FBSDeviceIp,db_battinf.tb_battinf.BattGroupName" +
+ String sql="select db_battinf.tb_battinf.battgroupid,db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName5,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.FBSDeviceIp,db_battinf.tb_battinf.BattGroupName" +
",db_battinf.tb_battinf.MonCount,db_battinf.tb_battinf.MonVolStd,db_battinf.tb_battinf.MonCapStd,db_battinf.tb_battinf.GroupIndexInFBSDevice " +
",db_ram_db.tb_LD9_setparam.dev_id,db_ram_db.tb_LD9_setparam.op_cmd,db_ram_db.tb_LD9_setparam.param_teststart_batt_num,db_ram_db.tb_LD9_setparam.param_cap,param_discharge_curr" +
",db_ram_db.tb_LD9_setparam.param_mon_curr_high,db_ram_db.tb_LD9_setparam.param_charge_curr,db_ram_db.tb_LD9_setparam.param_mon_curr_low,db_ram_db.tb_LD9_setparam.param_online_vol" +
@@ -77,6 +77,7 @@
BattInf binf=new BattInf();
binf.setBattGroupId(rs.getInt("battGroupId"));
binf.setStationName(rs.getString("stationName"));
+ binf.setStationName5(rs.getString("stationName5"));
binf.setFBSDeviceId(rs.getInt("fBSDeviceId"));
binf.setFbsDeviceIp(rs.getString("fbsDeviceIp"));
binf.setBattGroupName(rs.getString("battGroupName"));
--
Gitblit v1.9.1