From 864e4772eea5e0a589b6f6797d0695a3b3dd225e Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:19:31 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/App_bts_battgroupImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/App_bts_battgroupImpl.java b/gx_tieta/src/com/fgkj/dao/impl/App_bts_battgroupImpl.java
index 412f992..bee2438 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/App_bts_battgroupImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/App_bts_battgroupImpl.java
@@ -54,7 +54,7 @@
Page page=binf.getPage();
Connection conn=DBUtil.getConn();
String numberSql=" SELECT FOUND_ROWS() number";
- String sql=" select SQL_CALC_FOUND_ROWS distinct dev_id,battgroup_id,battgroup_index,battgroup_mon_cnt " +
+ String sql=" select SQL_CALC_FOUND_ROWS distinct dev_id,battgroup_id,battgroup_index,battgroup_mon_cnt,battgroup_float_vol,battgroup_float_curr,battgroup_register_code " +
" ,stationName,stationName1,stationName2,stationName3,stationName5,StationId " +
" from db_app_sys.tb_app_bts_battgroup " +
" left outer join db_battinf.tb_battinf on db_app_sys.tb_app_bts_battgroup.dev_id=db_battinf.tb_battinf.fBSDeviceId " +
@@ -75,7 +75,7 @@
}else{
sql+=dev_idT;
}
- String orderSql=" order by dev_id limit ?,? ";
+ String orderSql=" order by dev_id,battgroup_index asc limit ?,? ";
sql+=orderSql;
//System.out.println(sql); //"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationId()+"%","%"+binf.getStationName5()+"%",binf.getNum()
List<App_bts_battgroup> list=DAOHelper.executeQueryLimit(sql, conn,new Object[]{binf.getFBSDeviceId(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
@@ -89,6 +89,9 @@
abattgroup.setBattgroup_id(rs.getInt("battgroup_id"));
abattgroup.setBattgroup_index(rs.getInt("battgroup_index"));
abattgroup.setBattgroup_mon_cnt(rs.getInt("battgroup_mon_cnt"));
+ abattgroup.setBattgroup_float_vol(rs.getFloat("battgroup_float_vol"));
+ abattgroup.setBattgroup_float_curr(rs.getFloat("battgroup_float_curr"));
+ abattgroup.setBattgroup_register_code(rs.getString("battgroup_register_code"));
abattgroup.setStationId(rs.getString("stationId"));
abattgroup.setStationName(rs.getString("stationName"));
abattgroup.setStationName1(rs.getString("stationName1"));
--
Gitblit v1.9.1