81041
2018-12-10 ebd1b9316de01be57c3ed92fc0c002a1a45b29b2
gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java
@@ -107,7 +107,7 @@
      String baseSql = "select SQL_CALC_FOUND_ROWS distinct(db_alarm.tb_battalarm_data_history.BattGroupId),db_alarm.tb_battalarm_data_history.num,alm_signal_id,db_alarm.tb_battalarm_data_history.monnum,alm_value,alm_level,alm_is_confirmed,alm_confirmed_time,alm_start_time,alm_end_time,  " +
            " stationname,stationname5,battgroupname" +
            " from db_alarm.tb_battalarm_data_history,db_battinf.tb_battinf   " +
            " where  alm_id in(?,?,?,?,?,?)  and alm_signal_id%2 in(?,?)  " +
            " where  alm_id in(?,?,?,?,?,?,?)  and alm_signal_id%2 in(?,?)  " +
            " and alm_level in(?,?,?,?) " +
            " and alm_start_time>=? and alm_start_time<=?  " +
            " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ?  and db_battinf.tb_battinf.stationname5 like ? ";
@@ -149,6 +149,7 @@
      //System.out.println(sql);
      List<Batt_Maint_Dealarm> list= DAOHelper.executeQueryLimit(sql,conn,
               new Object[] { 
                    mainf.getUsr_id(),
                  mainf.getFault_type_id(),
                  mainf.getFault_level(),
                  mainf.getRecord_uid(),