81041
2018-11-01 162b1ec7816f035de05ef93ba432e64b95c96b7b
gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java
@@ -306,7 +306,7 @@
      String sql="";
      String baseSql=" SELECT SQL_CALC_FOUND_ROWS distinct tb_devalarm_data.num,dev_id,dev_ip,alm_type,alm_level,alm_start_time,alm_end_time," +
            " alm_is_confirmed,alm_confirmed_time,alm_cleared_type," +
            " db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.FbsDeviceName  " +
            " 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 " ;
@@ -336,6 +336,14 @@
         baseSql+=stationSql2T;
      }else{
         baseSql+=stationSql2F;
      }
      //用于区县
      String stationSql5T=" and stationname5!=? ";//全部
      String stationSql5F=" and stationname5=? ";
      if(ddata.getStationName5().equals("")){
         baseSql+=stationSql5T;
      }else{
         baseSql+=stationSql5F;
      }
      //用于故障事件
      String almTypeT=" and alm_type!=? ";//全部
@@ -378,7 +386,7 @@
                  
                  ddata.setDev_name(rs.getString("FbsDeviceName"));
                  ddata.setStationName(rs.getString("stationName"));                  
                  ddata.setStationName5(rs.getString("stationName5"));
                  list.add(ddata);
               }
            } catch (SQLException e) {