From 294468d95066c1f8a4af74b1dbdd44b45564d288 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 05 十一月 2018 17:32:01 +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/ram/Bts_gprs_stateImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_gprs_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_gprs_stateImpl.java
index 76ba829..c1e16eb 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_gprs_stateImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_gprs_stateImpl.java
@@ -41,7 +41,7 @@
//鏍规嵁璁惧id璇诲彇鐨勮澶囪繛鎺ョ殑gprs妯″潡鐨勪俊鍙峰��
public List serchByCondition(Object obj) {
Bts_gprs_state gprs=(Bts_gprs_state) obj;
- String sql=" select distinct db_ram_db.tb_bts_gprs_state.num,dev_id,op_cmd,record_datetime,scq_val" +
+ String sql=" select distinct db_ram_db.tb_bts_gprs_state.num,dev_id,op_cmd,AT_cmd,ack_inf" +
" ,stationName,FBSDeviceName " +
" from db_ram_db.tb_bts_gprs_state,db_battinf.tb_battinf " +
" where db_ram_db.tb_bts_gprs_state.dev_id=db_battinf.tb_battinf.FBSDeviceId " +
@@ -57,8 +57,8 @@
g.setNum(rs.getInt("num"));
g.setDev_id(rs.getInt("dev_id"));
g.setOp_cmd(rs.getInt("op_cmd"));
- g.setRecord_datetime(rs.getTimestamp("record_datetime"));
- g.setScq_val(rs.getString("scq_val"));
+ g.setAT_cmd(rs.getString("aT_cmd"));
+ g.setAck_inf(rs.getString("ack_inf"));
g.setStationName(rs.getString("stationName"));
g.setFBSDeviceName(rs.getString("fBSDeviceName"));
list.add(g);
--
Gitblit v1.9.1