From 3cbf9a965653fef1e785cc0717cb2d67d9691233 Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.25>
Date: 星期四, 27 九月 2018 14:11:16 +0800
Subject: [PATCH] 电池组续航时间查询添加市级筛选
---
gx_tieta/src/com/fgkj/dao/impl/Batttestdata_infDAOImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batttestdata_infDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batttestdata_infDAOImpl.java
index a16dee8..c854400 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batttestdata_infDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batttestdata_infDAOImpl.java
@@ -449,7 +449,7 @@
" WHERE tb_batttestdata_inf.test_starttime>=? and tb_batttestdata_inf.test_starttime<=? " +
" and db_batt_testdata.tb_batttestdata_inf.data_available=1 ";
//鏈烘埧缁存姢鍖洪�夋嫨
- String stationSql=" AND db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname1 like ? ";
+ String stationSql=" AND db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname2 like ? ";
baseSql+=stationSql;
String endSql=" ORDER BY db_battinf.tb_battinf.stationid asc,tb_batttestdata_inf.BattGroupId asc,db_batt_testdata.tb_batttestdata_inf.test_starttime desc ";
sql=baseSql+endSql;
@@ -458,7 +458,7 @@
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),
new Object[]{
binf.getBattProductDate(),binf.getBattProductDate1(),
- "%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%"
+ "%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%"
}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -520,7 +520,7 @@
"LEFT OUTER JOIN db_ram_db.cmcc_power_data ON db_battinf.tb_battinf.fbsdeviceid=cmcc_power_data.dev_id " +
"where ";
//鏈烘埧缁存姢鍖洪�夋嫨
- String stationSql=" db_battinf.tb_battinf.stationname like ? AND db_battinf.tb_battinf.stationname1 like ? ";
+ String stationSql=" db_battinf.tb_battinf.stationname like ? AND db_battinf.tb_battinf.stationname1 like ? AND db_battinf.tb_battinf.stationname2 like ? ";
baseSql+=stationSql;
//鐢垫睜鐘舵��
String stateSqlT=" AND batt_state=? ";
@@ -536,7 +536,7 @@
String orderSql=" order by db_battinf.tb_battinf.stationid asc";
sql=baseSql+endSql+orderSql;
//System.out.println(sql);
- List<Batt_State> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%"
+ List<Batt_State> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%"
,binf.getNum()}, new CallBack() {
public List getResults(ResultSet rs) {
--
Gitblit v1.9.1