From 1c45aa6534cb6b48f9dfeadd5b259b070e7e8ae7 Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.25>
Date: 星期四, 27 九月 2018 17:08:09 +0800
Subject: [PATCH] 设备告警参数加省市筛选条件
---
gx_tieta/src/com/fgkj/dao/impl/Dev_paramImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Dev_paramImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Dev_paramImpl.java
index aefaf23..99a5079 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Dev_paramImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Dev_paramImpl.java
@@ -115,7 +115,8 @@
" alm_low_level,alm_high_en,alm_low_en," +
" db_battinf.tb_battinf.stationname " +
" from db_param.tb_dev_param,db_battinf.tb_battinf " +
- " where db_param.tb_dev_param.dev_id=db_battinf.tb_battinf.FBSDeviceId " ;
+ " where db_param.tb_dev_param.dev_id=db_battinf.tb_battinf.FBSDeviceId " +
+ " and StationName1 like ? and StationName2 like ? and StationName like ? " ;
//璁惧id鏉′欢
String devSqlT=" and dev_id=? ";
String devSqlF=" and dev_id!=? ";
@@ -135,7 +136,7 @@
String endSql=" order by db_param.tb_dev_param.num asc ";
//鏈�缁堢殑SQl
sql=baseSql+endSql;
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{dparam.getDev_id(),dparam.getAlm_id()}, new CallBack() {
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+dparam.getStationName1()+"%","%"+dparam.getStationName2()+"%","%"+dparam.getStationName()+"%",dparam.getDev_id(),dparam.getAlm_id()}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
--
Gitblit v1.9.1