longyvfengyun
2022-05-24 9c0abeb2aa04d66e7647afbf51b923f35b311977
后台提交
1个文件已修改
14 ■■■■■ 已修改文件
src/com/fgkj/dao/impl/BattinfThirdImpl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/com/fgkj/dao/impl/BattinfThirdImpl.java
@@ -36,6 +36,8 @@
                binf.setMonCapStd(rs.getFloat("monCapStd"));
                binf.setMonResStd(rs.getFloat("monResStd"));
                binf.setMonSerStd(rs.getFloat("monserstd"));
                binf.setFloatVolLevel(rs.getFloat("FloatVolLevel"));
                binf.setOfflineVolLevel(rs.getFloat("OfflineVolLevel"));
                Batttestdata_inf tdata = new Batttestdata_inf();
                tdata.setBattGroupId(rs.getInt("battGroupId"));
@@ -93,14 +95,14 @@
        List list = null;
        String sql="";
        BattInf binf = bmd.getBinf();
        String sqlT="select distinct(db_battinf.tb_battinf.BattgroupId),moncapstd,monvolstd,monresstd,monserstd,FloatVolLevel,OfflineVolLevel " +
        String sqlT="select distinct(db_battinf.tb_battinf.BattgroupId),moncapstd,monvolstd,monresstd,monserstd,db_battinf.tb_battinf.FloatVolLevel,db_battinf.tb_battinf.OfflineVolLevel " +
                ",db_batt_testdata.tb_batttestdata_inf.battgroupid,max_monvol,min_monvol,db_batt_testdata.tb_batttestdata_inf.test_record_count,test_type,test_record_count " +
                "from db_battinf.tb_battinf,db_batt_testdata.tb_batttestdata_inf " +
                "where " +
                "db_battinf.tb_battinf.BattgroupId=db_batt_testdata.tb_batttestdata_inf.BattGroupId    " +
                "and db_battinf.tb_battinf.battgroupid=? and db_batt_testdata.tb_batttestdata_inf.data_available=1 " +
                "and db_batt_testdata.tb_batttestdata_inf.test_type=?  and db_batt_testdata.tb_batttestdata_inf.test_starttype=3 ";
        String sqlE="select distinct(db_battinf.tb_battinf.BattgroupId),moncapstd,monvolstd,monresstd,monserstd,FloatVolLevel,OfflineVolLevel " +
        String sqlE="select distinct(db_battinf.tb_battinf.BattgroupId),moncapstd,monvolstd,monresstd,monserstd,db_battinf.tb_battinf.FloatVolLevel,db_battinf.tb_battinf.OfflineVolLevel " +
                ",db_batt_testdata.tb_battresdata_inf.battgroupid,db_batt_testdata.tb_battresdata_inf.test_record_count,test_type,test_record_count  " +
                "from db_battinf.tb_battinf,db_batt_testdata.tb_battresdata_inf " +
                "where " +
@@ -182,7 +184,7 @@
        List list = null;
        String sql="";
        BattInf binf = bmd.getBinf();
        String sqlT="select distinct(db_battinf.tb_battinf.BattgroupId),moncount,moncapstd,monvolstd,monresstd,monserstd" +
        String sqlT="select distinct(db_battinf.tb_battinf.BattgroupId),moncount,moncapstd,monvolstd,monresstd,monserstd,db_battinf.tb_battinf.FloatVolLevel,db_battinf.tb_battinf.OfflineVolLevel" +
                ",db_batt_testdata.tb_batttestdata_inf.battgroupid,max_monvol,min_monvol,db_batt_testdata.tb_batttestdata_inf.test_record_count,db_batt_testdata.tb_batttestdata_inf.test_type,db_batt_testdata.tb_batttestdata_inf.test_record_count" +
                ",db_batt_testdata.tb_batttestdatastop_"+binf.getBattGroupId()+".test_starttime,db_batt_testdata.tb_batttestdatastop_"+binf.getBattGroupId()+".record_time,db_batt_testdata.tb_batttestdatastop_"+binf.getBattGroupId()+".test_timelong,db_batt_testdata.tb_batttestdatastop_"+binf.getBattGroupId()+".group_vol,db_batt_testdata.tb_batttestdatastop_"+binf.getBattGroupId()+".test_curr,db_batt_testdata.tb_batttestdatastop_"+binf.getBattGroupId()+".test_cap,db_batt_testdata.tb_batttestdatastop_"+binf.getBattGroupId()+".mon_num,db_batt_testdata.tb_batttestdatastop_"+binf.getBattGroupId()+".mon_vol  " +
                " from db_battinf.tb_battinf,db_batt_testdata.tb_batttestdata_inf,db_batt_testdata.tb_batttestdatastop_"+binf.getBattGroupId()+"  "+
@@ -198,7 +200,7 @@
                " ,db_batt_testdata.tb_battresdata_" +binf.getBattGroupId()+".group_vol,db_batt_testdata.tb_battresdata_" +binf.getBattGroupId()+".test_curr,db_batt_testdata.tb_battresdata_" +binf.getBattGroupId()+".test_starttime,mon_num,mon_vol,mon_tmp,mon_res,mon_ser,conn_res   " +
                " from db_battinf.tb_battinf,db_batt_testdata.tb_battresdata_inf,db_batt_testdata.tb_battresdata_"+binf.getBattGroupId()+" "+
                " where " +
                " db_battinf.tb_battinf.BattgroupId=db_batt_testdata.tb_battresdata_inf.BattGroupId" +
                " db_battinf.tb_battinf.BattgroupId=db_batt_testdata.tb_battresdata_inf.BattGroupId,db_battinf.tb_battinf.FloatVolLevel,db_battinf.tb_battinf.OfflineVolLevel" +
                " and db_batt_testdata.tb_battresdata_inf.BattGroupId=db_batt_testdata.tb_battresdata_"+binf.getBattGroupId()+".battgroupid" +
                " and db_batt_testdata.tb_battresdata_inf.test_record_count=db_batt_testdata.tb_battresdata_"+binf.getBattGroupId()+".test_record_count" +
                " and db_battinf.tb_battinf.battgroupid=? and db_batt_testdata.tb_battresdata_inf.data_available=1 and  db_batt_testdata.tb_battresdata_inf.test_type=? ";
@@ -259,7 +261,9 @@
                            binf.setMonCapStd(rs.getFloat("monCapStd"));
                            binf.setMonResStd(rs.getFloat("monResStd"));
                            binf.setMonSerStd(rs.getFloat("monSerStd"));
                            binf.setFloatVolLevel(rs.getFloat("FloatVolLevel"));
                            binf.setOfflineVolLevel(rs.getFloat("OfflineVolLevel"));
                            Battresdata_inf rinf=new Battresdata_inf();
                            rinf.setBattGroupId(rs.getInt("battGroupId"));
                            rinf.setTest_record_count(rs.getInt("test_record_count"));