81041
2018-12-06 562c1d7a68f292aae2f9da775648bef2d4b967a4
gx_tieta/src/com/fgkj/dao/impl/BattTest_ResImpl.java
@@ -519,13 +519,13 @@
      Connection conn=DBUtil.getConn();
      String numberSql=" SELECT FOUND_ROWS() number";
      String baseSql="";
      String baseTestSql = "select SQL_CALC_FOUND_ROWS distinct(db_batt_testdata.tb_batttestdata_inf.BattgroupId),StationId,StationName,StationName5,BattGroupName,moncapstd,monvolstd" +
      String baseTestSql = "select SQL_CALC_FOUND_ROWS distinct(db_batt_testdata.tb_batttestdata_inf.BattgroupId),StationId,StationName,StationName1,StationName2,StationName5,BattGroupName,moncapstd,monvolstd" +
            ",db_batt_testdata.tb_batttestdata_inf.num,db_batt_testdata.tb_batttestdata_inf.test_starttime,db_batt_testdata.tb_batttestdata_inf.test_record_count,db_batt_testdata.tb_batttestdata_inf.test_type,db_batt_testdata.tb_batttestdata_inf.test_starttype,db_batt_testdata.tb_batttestdata_inf.test_curr,db_batt_testdata.tb_batttestdata_inf.test_cap,db_batt_testdata.tb_batttestdata_inf.max_monvol,db_batt_testdata.tb_batttestdata_inf.min_monvol,db_batt_testdata.tb_batttestdata_inf.min_monnum" +
            ",db_batt_testdata.tb_batttestdata_inf.data_new " +
            "from db_batt_testdata.tb_batttestdata_inf   " +
            "left outer join db_battinf.tb_battinf on db_battinf.tb_battinf.BattgroupId=db_batt_testdata.tb_batttestdata_inf.BattGroupId  "+
            "where db_batt_testdata.tb_batttestdata_inf.data_available=1 " ;
      String baseResSql = "select SQL_CALC_FOUND_ROWS distinct(db_batt_testdata.tb_battresdata_inf.BattgroupId),StationId,StationName,StationName5,BattGroupName,moncapstd,monvolstd" +
      String baseResSql = "select SQL_CALC_FOUND_ROWS distinct(db_batt_testdata.tb_battresdata_inf.BattgroupId),StationId,StationName,StationName1,StationName2,StationName5,BattGroupName,moncapstd,monvolstd" +
            ",db_batt_testdata.tb_battresdata_inf.num,db_batt_testdata.tb_battresdata_inf.test_starttime,db_batt_testdata.tb_battresdata_inf.test_record_count,db_batt_testdata.tb_battresdata_inf.test_type,db_batt_testdata.tb_battresdata_inf.Test_devtype,db_batt_testdata.tb_battresdata_inf.test_curr,db_batt_testdata.tb_battresdata_inf.data_new  " +
            "from db_batt_testdata.tb_battresdata_inf   " +
            "left outer join db_battinf.tb_battinf on  db_battinf.tb_battinf.BattgroupId=db_batt_testdata.tb_battresdata_inf.BattGroupId  " +
@@ -628,6 +628,8 @@
                              binf.setBattGroupId(rs.getInt("battGroupId"));
                              binf.setStationId(rs.getString("stationId"));
                              binf.setStationName(rs.getString("stationName"));
                              binf.setStationName1(rs.getString("stationName1"));
                              binf.setStationName2(rs.getString("stationName2"));
                              binf.setStationName5(rs.getString("stationName5"));
                              binf.setBattGroupName(rs.getString("battGroupName"));
                              binf.setMonCapStd(rs.getFloat("monCapStd"));
@@ -675,6 +677,8 @@
                              binf.setBattGroupId(rs.getInt("battGroupId"));
                              binf.setStationId(rs.getString("stationId"));
                              binf.setStationName(rs.getString("stationName"));
                              binf.setStationName1(rs.getString("stationName1"));
                              binf.setStationName2(rs.getString("stationName2"));
                              binf.setStationName5(rs.getString("stationName5"));
                              binf.setBattGroupName(rs.getString("battGroupName"));
                              binf.setMonCapStd(rs.getFloat("monCapStd"));