From c51674f412a53fc9eb6a9453fc3ac4a6ffd89a1d Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.31>
Date: 星期三, 31 十月 2018 10:37:00 +0800
Subject: [PATCH] 电池充放电数据管理加省市结果
---
gx_tieta/src/com/fgkj/dao/impl/BattPower_offImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 e85d740..d201120 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattPower_offImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattPower_offImpl.java
@@ -126,7 +126,7 @@
",db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName1 " +
" 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.StationName LIKE ? AND db_battinf.tb_battinf.StationName2 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.getBattProductDate(),binf.getBattProductDate1()
+ List<BattPower_off> list = DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%",binf.getBattProductDate(),binf.getBattProductDate1()
,binf.getNum(),uinf.getUId(),"%"+binf.getStationName1()+"%",(page.getPageCurr() - 1)*page.getPageSize(),
page.getPageSize()}, new CallBack() {
--
Gitblit v1.9.1