gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$10.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$11.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$12.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$13.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$14.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$15.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$16.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$17.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$18.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$9.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/Batt_endurance.classBinary files differ
gx_tieta/src/com/fgkj/dao/impl/Batttestdata_infDAOImpl.java
@@ -573,7 +573,7 @@ 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,endurance_actual_timelong_max" + ",endurance_actual_timelong_min,is_out_stand,batts_moncapstd,batts_teststarttime " + + ",endurance_actual_timelong_min,is_out_stand,batts_moncapstd,batts_teststarttime,real_cap_group1,real_cap_group2,real_cap_group3,real_cap_group4 " + ",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 "+ @@ -620,6 +620,10 @@ b.setReal_curr(rs.getFloat("real_curr")); b.setBatts_moncapstd(rs.getString("batts_moncapstd")); b.setBatts_teststarttime(rs.getString("batts_teststarttime")); b.setReal_cap_group1(rs.getFloat("real_cap_group1")); b.setReal_cap_group2(rs.getFloat("real_cap_group2")); b.setReal_cap_group3(rs.getFloat("real_cap_group3")); b.setReal_cap_group4(rs.getFloat("real_cap_group4")); 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")); gx_tieta/src/com/fgkj/dto/Batt_endurance.java
@@ -14,6 +14,10 @@ private float endurance_actual_timelong_max;//实际最大 private float endurance_actual_timelong_min;//实际最小 private int is_out_stand; private float real_cap_group1;//电池组的实际容量 private float real_cap_group2; private float real_cap_group3; private float real_cap_group4; private String batts_moncapstd;//机房电池组的标称容量 private String batts_teststarttime;//机房电池组的和容开始时间 private String note; @@ -145,6 +149,30 @@ public void setBatts_teststarttime(String batts_teststarttime) { this.batts_teststarttime = batts_teststarttime; } public float getReal_cap_group1() { return real_cap_group1; } public void setReal_cap_group1(float real_cap_group1) { this.real_cap_group1 = real_cap_group1; } public float getReal_cap_group2() { return real_cap_group2; } public void setReal_cap_group2(float real_cap_group2) { this.real_cap_group2 = real_cap_group2; } public float getReal_cap_group3() { return real_cap_group3; } public void setReal_cap_group3(float real_cap_group3) { this.real_cap_group3 = real_cap_group3; } public float getReal_cap_group4() { return real_cap_group4; } public void setReal_cap_group4(float real_cap_group4) { this.real_cap_group4 = real_cap_group4; } @Override public String toString() { return "Batt_endurance [num=" + num + ", deviceId=" + deviceId + ", stationid=" + stationid + ", real_cap=" @@ -152,11 +180,14 @@ + endurance_theory_timelong + ", endurance_actual_timelong=" + endurance_actual_timelong + ", endurance_actual_timelong_max=" + endurance_actual_timelong_max + ", endurance_actual_timelong_min=" + endurance_actual_timelong_min + ", is_out_stand=" + is_out_stand + ", batts_moncapstd=" + batts_moncapstd + ", batts_teststarttime=" + batts_teststarttime + ", note=" + note + ", stationName=" + stationName + ", stationName1=" + stationName1 + ", stationName2=" + stationName2 + ", stationName5=" + stationName5 + ", monvolstd=" + monvolstd + ", page=" + page + "]"; + ", real_cap_group1=" + real_cap_group1 + ", real_cap_group2=" + real_cap_group2 + ", real_cap_group3=" + real_cap_group3 + ", real_cap_group4=" + real_cap_group4 + ", batts_moncapstd=" + batts_moncapstd + ", batts_teststarttime=" + batts_teststarttime + ", note=" + note + ", stationName=" + stationName + ", stationName1=" + stationName1 + ", stationName2=" + stationName2 + ", stationName5=" + stationName5 + ", monvolstd=" + monvolstd + ", page=" + page + "]"; } }