81041
2018-11-01 c58e27646913613df6e4e77656be515d3d7ea494
gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
@@ -63,7 +63,7 @@
      Page p=binf.getPage();
      Connection conn=DBUtil.getConn();
      String numberSql=" SELECT FOUND_ROWS() number";
      String sql=" select SQL_CALC_FOUND_ROWS distinct tb_deverror_record.num,tb_deverror_record.stationid,record_time,error_descript,error_en " +
      String sql=" select SQL_CALC_FOUND_ROWS distinct tb_deverror_record.num,tb_deverror_record.stationid,record_time,error_descript,error_en,picture_num " +
            "  ,db_battinf.tb_battinf.stationname,stationname1,stationname2,stationname3,stationname5 " +
            "  from db_battinf.tb_deverror_record,db_battinf.tb_battinf " +
            " where tb_deverror_record.stationid=tb_battinf.stationid " +
@@ -97,6 +97,7 @@
                  dev_record.setRecord_time(rs.getTimestamp("record_time"));
                  dev_record.setError_descript(rs.getString("error_descript"));
                  dev_record.setError_en(rs.getInt("error_en"));
                  dev_record.setPicture_num(rs.getInt("picture_num"));
                  Page page=new Page();
                  dev_record.setPage(page);
                  list.add(dev_record);