81041
2018-11-29 e9d6bfd028178ad484ba7ccd9a6ad6d5aba64e15
gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
@@ -48,7 +48,7 @@
      Page page=bendurance.getPage();
      Connection conn=DBUtil.getConn();
      String numberSql=" SELECT FOUND_ROWS() number";
      String sql="select SQL_CALC_FOUND_ROWS distinct tb_batt_endurance.num,tb_batt_endurance.deviceid,tb_batt_endurance.stationid,real_cap,tb_batt_endurance.moncapstd,real_curr,endurance_theory_timelong,endurance_actual_timelong,is_out_stand " +
      String sql="select SQL_CALC_FOUND_ROWS distinct tb_batt_endurance.num,tb_batt_endurance.deviceid,tb_batt_endurance.stationid,real_cap,tb_batt_endurance.moncapstd,real_curr,endurance_theory_timelong,endurance_actual_timelong,endurance_actual_timelong_max,endurance_actual_timelong_min,is_out_stand " +
            ",db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName1,db_battinf.tb_battinf.StationName2,db_battinf.tb_battinf.StationName5  " +
            " from web_site.tb_batt_endurance,db_battinf.tb_battinf " +
            " where tb_batt_endurance.stationid=db_battinf.tb_battinf.stationid "+
@@ -101,8 +101,10 @@
                  b.setReal_cap(rs.getFloat("real_cap"));
                  b.setMoncapstd(rs.getFloat("moncapstd"));
                  b.setReal_curr(rs.getFloat("real_curr"));
                  b.setEndurance_theory_timelong(rs.getInt("endurance_theory_timelong"));
                  b.setEndurance_actual_timelong(rs.getInt("endurance_actual_timelong"));
                  b.setEndurance_theory_timelong(rs.getFloat("endurance_theory_timelong"));
                  b.setEndurance_actual_timelong(rs.getFloat("endurance_actual_timelong"));
                  b.setEndurance_actual_timelong_max(rs.getFloat("endurance_actual_timelong_max"));
                  b.setEndurance_actual_timelong_min(rs.getFloat("endurance_actual_timelong_min"));
                  b.setStationName(rs.getString("stationname"));
                  b.setStationName1(rs.getString("stationname1"));
                  b.setStationName2(rs.getString("stationname2"));