From 5488fce943934f08cb00d5a17bf76fb7124c9e29 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.28>
Date: 星期一, 19 十一月 2018 09:39:36 +0800
Subject: [PATCH] 首页查询加上在线电压
---
gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
index 6e02453..d1b03ac 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
@@ -1368,8 +1368,8 @@
String sql="select count(num) as number " +
"from db_alarm.tb_battalarm_data " +
"where " +
- "alm_cleared_type=0 " +
- "and alm_id not in("+AlarmDaoFactory.Alarm_vol_Online+","+AlarmDaoFactory.Alarm_CapAlarm+","+AlarmDaoFactory.Alarm_CapChange+","+AlarmDaoFactory.Alarm_res_Conn+","+AlarmDaoFactory.ALM_TYPE_DisChargeMonVol_ID+")"+
+ "alm_cleared_type=0 " +//+AlarmDaoFactory.Alarm_vol_Online+","
+ "and alm_id not in("+AlarmDaoFactory.Alarm_CapAlarm+","+AlarmDaoFactory.Alarm_CapChange+","+AlarmDaoFactory.Alarm_res_Conn+","+AlarmDaoFactory.ALM_TYPE_DisChargeMonVol_ID+")"+
"and db_alarm.tb_battalarm_data.BattGroupId in (select distinct db_battinf.tb_battinf.battgroupid " +
" from db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf " +
" where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId " +
--
Gitblit v1.9.1