From 3d175b70811d8da4258aa0ec6cc6d79ff912b36f Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 25 十月 2018 17:02:03 +0800
Subject: [PATCH] 提交内容
---
gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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..5d5a60a 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=? ";
@@ -346,11 +354,11 @@
" and db_user.tb_user_inf.uid=?) ";
baseSql+=stationSql;
//鎺掑簭
- String endSql=" ORDER BY alm_start_time DESC ";
+ String endSql=" ORDER BY alm_start_time DESC,db_alarm.tb_devalarm_data.dev_id asc ";
//鍒嗛〉
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