From bb65f33c9fdff40844f17e95e3e75aed2b42bda2 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 25 十月 2018 14:47:33 +0800
Subject: [PATCH] 修改内容
---
gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 617f063..ae67a22 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
@@ -185,8 +185,8 @@
" 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=? ) " +
- " limit ?,? " +
- " order by tb_battmap_information.StationId ";
+ " 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() {
public List getResults(ResultSet rs) {
@@ -224,7 +224,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 " +
+ 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 " +
" 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 (" +
@@ -245,6 +245,9 @@
binformation.setNum(rs.getInt("num"));
binformation.setStationId(rs.getString("stationId"));
binformation.setStationName(rs.getString("stationName"));
+ binformation.setStationName1(rs.getString("stationName1"));
+ binformation.setStationName2(rs.getString("stationName2"));
+ binformation.setStationName3(rs.getString("stationName3"));
binformation.setAddress(rs.getString("address"));
binformation.setLongitude(rs.getDouble("longitude"));
binformation.setLatitude(rs.getDouble("latitude"));
--
Gitblit v1.9.1