修改

81041

2018-11-01 4040f55caa0fd999d279d4a4b9ef8cda0ab7a832

 gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java

@@ -309,7 +309,7 @@
            " db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.stationName5,db_battinf.tb_battinf.FbsDeviceName  " +

            " FROM db_alarm.tb_devalarm_data,db_battinf.tb_battinf " +

            " WHERE  " +

            " tb_devalarm_data.dev_id=db_battinf.tb_battinf.FbsDeviceId  and tb_battinf.station_intall=1 " ;

            " tb_devalarm_data.dev_id=db_battinf.tb_battinf.FbsDeviceId  and tb_battinf.station_install=1 " ;

      //设备实时告警

      String alarmTypeSql=" AND alm_cleared_type=0 ";

      baseSql+=alarmTypeSql;