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/dto/BattPower_off.java | 17 ++++++++++++++++- gx_tieta/src/com/fgkj/dao/impl/BattPower_offImpl.java | 8 +++++--- 2 files changed, 21 insertions(+), 4 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); } diff --git a/gx_tieta/src/com/fgkj/dto/BattPower_off.java b/gx_tieta/src/com/fgkj/dto/BattPower_off.java index 4718b23..77b7197 100644 --- a/gx_tieta/src/com/fgkj/dto/BattPower_off.java +++ b/gx_tieta/src/com/fgkj/dto/BattPower_off.java @@ -15,6 +15,8 @@ private String StationName; private String StationName1; + private String StationName2; + private String StationName5; public BattPower_off() { super(); @@ -82,6 +84,18 @@ public void setStationName1(String stationName1) { StationName1 = stationName1; } + public String getStationName2() { + return StationName2; + } + public void setStationName2(String stationName2) { + StationName2 = stationName2; + } + public String getStationName5() { + return StationName5; + } + public void setStationName5(String stationName5) { + StationName5 = stationName5; + } @Override public String toString() { return "BattPower_off [num=" + num + ", dev_id=" + dev_id @@ -90,7 +104,8 @@ + poweroff_stoptime + ", timelong=" + timelong + ", power_state=" + power_state + ", note=" + note + ", StationName=" + StationName + ", StationName1=" - + StationName1 + "]"; + + StationName1 + ", StationName2=" + StationName2 + + ", StationName5=" + StationName5 + "]"; } -- Gitblit v1.9.1