From 6a164ed3a382326e1f246f4629e6d2ffe276ece2 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.29>
Date: 星期一, 15 十月 2018 14:06:15 +0800
Subject: [PATCH] 统计基站在状态

---
 gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java
index 3b98e06..8808597 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java
@@ -144,20 +144,12 @@
 				   " ,"+AlarmDaoFactory.ALM_TYPE_BTS9100S_TEMPUP_ComError_ID+","+AlarmDaoFactory.ALM_TYPE_BTS9100S_TEMPLOW_ComError_ID+","+AlarmDaoFactory.ALM_TYPE_BTS9100S_DAMPUP_ComError_ID+","+AlarmDaoFactory.ALM_TYPE_BTS9100S_DAMPLOW_ComError_ID+")  " +
 				   " and  alm_start_time>=?  and  alm_start_time<=?   " +
 				   " and stationname1 like ? and stationname2 like  ? and stationname3 like ? and stationid like ? " ;
-		//寮傚父绫诲瀷绛涢��
-		String alm_typeSqlT=" and alm_type!=? ";
-		String alm_typeSqlF=" and alm_type=? ";
-		if(binf.getNum()==0){
-			sql+=alm_typeSqlT;
-		}else{
-			sql+=alm_typeSqlF;
-		}
 		//鎺掑簭
 		String orderSql=" order by dev_id,alm_start_time,alm_type asc ";
 		sql+=orderSql;
 		//System.out.println(sql);
 		//binf.getBattInUseDate(),binf.getBattInUseDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%",
-		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getBattInUseDate(),binf.getBattInUseDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%",binf.getNum()}, new CallBack() {
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getBattInUseDate(),binf.getBattInUseDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%"}, new CallBack() {
 			
 			public List getResults(ResultSet rs) {
 				List list=new ArrayList();

--
Gitblit v1.9.1