From cea36d9bcd04524f2e31fe4c35beabcbf5459ca7 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@192.168.10.11>
Date: 星期一, 26 十一月 2018 15:25:52 +0800
Subject: [PATCH] 手机 机房历史事件查询（未包括详情及详情按钮）
---
gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
index 876cf42..f7606c3 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
@@ -184,7 +184,7 @@
" left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.stationid=db_battinf.tb_battinf.stationid " +
" left outer join db_user.tb_user_battgroup_baojigroup_usr on db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
" left outer join db_user.tb_user_inf on tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
- " where db_user.tb_user_inf.uid=? ) " +
+ " where db_user.tb_user_inf.uid=? and tb_battinf.station_install=true) " +
" order by tb_battmap_information.StationId "+
" limit ?,? " ;
List<BattMap_information> list=DAOHelper.executeQueryLimit(sql, conn,new Object[]{uid,(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
@@ -225,7 +225,7 @@
//9.1鏌ヨ宸茬粡娣诲姞鐗╃悊淇℃伅鐨勬満鎴�(鐢ㄦ埛绠＄悊鐨勶紝3.鏍规嵁鍏蜂綋id鏌ヨ鍛婅淇℃伅绛�)
public List serchInBattMapByUid3(Object obj) {
BattMap_information binfor=(BattMap_information) obj;
- String sql="select distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId,tb_battinf.stationName1,tb_battinf.stationName2,tb_battinf.stationName3 " +
+ String sql="select distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId,tb_battinf.stationName1,tb_battinf.stationName2,tb_battinf.stationName3,tb_battinf.stationName5 " +
" from web_site.tb_battmap_information,db_battinf.tb_battinf " +
" where tb_battmap_information.StationId=db_battinf.tb_battinf.StationId " +
" and tb_battmap_information.StationId in (" +
@@ -249,6 +249,7 @@
binformation.setStationName1(rs.getString("stationName1"));
binformation.setStationName2(rs.getString("stationName2"));
binformation.setStationName3(rs.getString("stationName3"));
+ binformation.setStationName5(rs.getString("stationName5"));
binformation.setAddress(rs.getString("address"));
binformation.setLongitude(rs.getDouble("longitude"));
binformation.setLatitude(rs.getDouble("latitude"));
--
Gitblit v1.9.1