From 4f149d9dd30b7703990ba376fc42d54edd7328d2 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.31>
Date: 星期三, 31 十月 2018 17:28:18 +0800
Subject: [PATCH] 机房停电查询添加区县
---
gx_tieta/src/com/fgkj/dao/impl/BattPower_offImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattPower_offImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattPower_offImpl.java
index d201120..cdc166e 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattPower_offImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattPower_offImpl.java
@@ -123,10 +123,10 @@
String numberSql=" SELECT FOUND_ROWS() number";
String sql=" SELECT SQL_CALC_FOUND_ROWS DISTINCT tb_battpower_off.dev_id,poweroff_starttime,poweroff_stoptime,timelong,power_state,note" +
- ",db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName1 " +
+ ",db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName1,db_battinf.tb_battinf.StationName2,db_battinf.tb_battinf.StationName5 " +
" FROM web_site.tb_battpower_off,db_battinf.tb_battinf " +
" WHERE tb_battpower_off.dev_id=db_battinf.tb_battinf.FBSDeviceId " +
- " AND db_battinf.tb_battinf.StationName LIKE ? AND db_battinf.tb_battinf.StationName2 LIKE ? " +
+ " AND db_battinf.tb_battinf.StationName LIKE ? AND db_battinf.tb_battinf.StationName2 LIKE ? AND db_battinf.tb_battinf.StationName5 LIKE ? " +
" AND poweroff_starttime>=? " +
" AND poweroff_starttime<=? ";
//瀹炴椂杩樻槸鍘嗗彶
@@ -148,7 +148,7 @@
//鍒嗛〉
String limitSql=" limit ?,?";
sql+=limitSql;
- List<BattPower_off> list = DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%",binf.getBattProductDate(),binf.getBattProductDate1()
+ List<BattPower_off> list = DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%",binf.getBattProductDate(),binf.getBattProductDate1()
,binf.getNum(),uinf.getUId(),"%"+binf.getStationName1()+"%",(page.getPageCurr() - 1)*page.getPageSize(),
page.getPageSize()}, new CallBack() {
@@ -164,6 +164,8 @@
bpoff.setTimelong(rs.getInt("timelong"));
bpoff.setStationName(rs.getString("stationName"));
bpoff.setStationName1(rs.getString("stationName1"));
+ bpoff.setStationName2(rs.getString("stationName2"));
+ bpoff.setStationName5(rs.getString("stationName5"));
bpoff.setNote(rs.getString("note"));
list.add(bpoff);
}
--
Gitblit v1.9.1