//统计修改

lxw

2022-05-24 184e2f84c6398586cb1932ef1f6379b57b76da8a

//统计修改

 src/com/fgkj/dao/impl/BattInfImpl.java

@@ -2209,7 +2209,7 @@
        Page page = bmd.getPage();
        Batttestdata_inf tinf = bmd.getTdata();
        String sql = "";
        String baseSql = " select  distinct(db_battinf.tb_battinf.BattgroupId),StationName1,StationName,stationip,BattGroupName,BattGroupName1,moncount,moncapstd,monvolstd,battproducer,battproductdate,battinusedate " +
        String baseSql = " select  distinct(db_battinf.tb_battinf.BattgroupId),StationName1,StationName,stationip,BattGroupName,BattGroupName1,moncount,moncapstd,monvolstd,MonResStd,MonSerStd,FloatVolLevel,OfflineVolLevel,battproducer,battproductdate,battinusedate " +
                " ,db_batt_testdata.tb_batttestdata_inf.test_record_count,test_starttime " +
                "from  db_battinf.tb_battinf,db_batt_testdata.tb_batttestdata_inf " +
                " where db_battinf.tb_battinf.battgroupid=db_batt_testdata.tb_batttestdata_inf.battgroupid " +
@@ -2283,6 +2283,10 @@
                        binf.setMonCount(rs.getInt("monCount"));
                        binf.setMonCapStd(rs.getFloat("monCapStd"));
                        binf.setMonVolStd(rs.getFloat("monVolStd"));
                        binf.setMonResStd(rs.getFloat("MonResStd"));
                        binf.setMonSerStd(rs.getFloat("MonSerStd"));
                        binf.setFloatVolLevel(rs.getFloat("FloatVolLevel"));
                        binf.setOfflineVolLevel(rs.getFloat("OfflineVolLevel"));
                        binf.setBattProducer(rs.getString("battProducer"));
                        binf.setBattProductDate(rs.getDate("battProductDate"));
                        binf.setBattInUseDate(rs.getDate("battInUseDate"));

 src/com/fgkj/dao/impl/Batttestdata_infDAOImpl.java

@@ -891,7 +891,7 @@
    public List serchByTestType(Object obj){
        final Batttestdata_inf tinf=(Batttestdata_inf) obj;
        String sql="";
        String baseSql="select battgroupid,test_curr,max_monvol,test_starttime,test_timelong,min_monvol,test_cap,min_monnum " +
        String baseSql="select battgroupid,test_curr,max_monvol,test_starttime,test_timelong,min_monvol,test_cap,min_monnum,group_vol " +
                " from db_batt_testdata.tb_batttestdata_inf " +
                " where  battgroupid=? and test_record_count=? " +
                " and record_time>=? and record_time<=?  " +
@@ -947,6 +947,7 @@
                        restcap=(float) BattCapFactory.GetMonomerCap(tinf.getTest_cap(), hourRate,batt.getTest_cap(), batt.getMax_monvol(), batt.getMin_monvol(), tinf.getGroup_vol(), BattCapFactory.CapType_Rest);
                        batt.setTest_timelong(rs.getInt("test_timelong"));
                        batt.setMin_monnum(rs.getInt("min_monnum"));
                        batt.setGroup_vol1(rs.getFloat("group_vol"));
                        batt.setGroup_vol(cap);//实际容量
                        batt.setMon_vol(restcap);//剩余容量
                        list.add(batt);

 src/com/fgkj/dto/Batttestdata_inf.java

@@ -24,6 +24,7 @@
    private String test_stoptype_reason;//放电终止原因
    private String test_starttypeHex;//存放具体的放电测试的类型
    private Float group_vol;
    private Float group_vol1;
    private Float test_curr;
    private Float test_cap;
    private Integer max_monnum;
@@ -375,6 +376,14 @@
        this.upload_client_type = upload_client_type;
    }

    public Float getGroup_vol1() {
        return group_vol1;
    }

    public void setGroup_vol1(Float group_vol1) {
        this.group_vol1 = group_vol1;
    }

    @Override
    public String toString() {
        return "Batttestdata_inf{" +