81041
2018-11-23 fe0566b75eb4cd447eaaf4b042e600b413698a99
gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java
@@ -1261,7 +1261,7 @@
      }
      return list;
   }
   //0.5查询实时告警数
   //0.5查询实时告警数(电池告警率)
   /*public List serchAlm(Object obj){
      Batt_Maint_Dealarm bmd=(Batt_Maint_Dealarm) obj;
      Battalarm_data adata=bmd.getAdata();
@@ -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   " +