From 35fefed0792c40cb99b8d15fa5811bbb5992bff9 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 21 一月 2019 10:42:24 +0800
Subject: [PATCH] 修改
---
gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java b/gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java
index b16cab1..e9daa0e 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java
@@ -43,13 +43,13 @@
// TODO Auto-generated method stub
return null;
}
- //鏍规嵁鐪佸競鍖烘満鎴垮悕绉版煡璇�(uid鏀惧湪num涓�)
+ //鏍规嵁璁惧id鏌ヨ(uid鏀惧湪num涓�)
public List serchByCondition(Object obj) {
BattInf binf=(BattInf) obj;
Page page=binf.getPage();
Connection conn=DBUtil.getConn();
String numberSql=" SELECT FOUND_ROWS() number";
- String sql=" select SQL_CALC_FOUND_ROWS distinct dev_id,thread_id,battgroup_cnt,battgroup_id1,battgroup_index1,battgroup_id2,battgroup_index2,battgroup_id3,battgroup_index3,battgroup_id4,battgroup_index4,connet_time,dev_comm_runtime,break_type " +
+ String sql=" select SQL_CALC_FOUND_ROWS distinct dev_id,thread_id,dev_mcu_uid,battgroup_cnt,battgroup_id1,battgroup_index1,battgroup_id2,battgroup_index2,battgroup_id3,battgroup_index3,battgroup_id4,battgroup_index4,connet_time,dev_comm_runtime,break_type " +
" ,stationName,stationName1,stationName2,stationName3,stationName5,StationId " +
" from db_app_sys.tb_app_bts_comm_task " +
" left outer join db_battinf.tb_battinf on db_app_sys.tb_app_bts_comm_task.dev_id=db_battinf.tb_battinf.fBSDeviceId " +
@@ -83,6 +83,7 @@
atask.setDev_id(rs.getInt("dev_id"));
atask.setThread_id(rs.getInt("thread_id"));
atask.setBattgroup_cnt(rs.getInt("battgroup_cnt"));
+ atask.setDev_mcu_uid(rs.getString("dev_mcu_uid"));
atask.setBattgroup_id1(rs.getInt("battgroup_id1"));
atask.setBattgroup_index1(rs.getInt("battgroup_index1"));
atask.setBattgroup_id2(rs.getInt("battgroup_id2"));
--
Gitblit v1.9.1