From 97db75238a96a75f41bafd469548c2a84ba37080 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期五, 28 九月 2018 14:31:04 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java
index 60276ab..9f25065 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java
@@ -329,6 +329,14 @@
}else{
baseSql+=stationSqlF;
}
+ //鐢ㄤ簬鏈烘埧绔欑偣
+ String stationSql2T=" and stationname2!=? ";//鍏ㄩ儴
+ String stationSql2F=" and stationname2=? ";
+ if(ddata.getStationName2().equals("")){
+ baseSql+=stationSql2T;
+ }else{
+ baseSql+=stationSql2F;
+ }
//鐢ㄤ簬鏁呴殰浜嬩欢
String almTypeT=" and alm_type!=? ";//鍏ㄩ儴
String almTypeF=" and alm_type=? ";
@@ -350,7 +358,7 @@
//鍒嗛〉
String limitSql=" LIMIT ?,? ";
sql=baseSql+endSql+limitSql;
- List<Batt_devalarm_data> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{ddata.getStationName1(),ddata.getStationName(),ddata.getAlm_type(),uinf.getUId(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
+ List<Batt_devalarm_data> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{ddata.getStationName1(),ddata.getStationName(),ddata.getStationName2(),ddata.getAlm_type(),uinf.getUId(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
--
Gitblit v1.9.1