Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/ResMeterMan...

whyclxw

2024-09-19 de562dee45fe7ca955a5b9ffa346bf52f772718d

Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/ResMeterManager

 src/main/java/com/whyc/pojo/BattgroupData.java

@@ -92,4 +92,8 @@
    @ApiModelProperty("内阻偏差率")
    private float resDevRate;

    @TableField(exist = false)
    @ApiModelProperty("预估容量百分比字符串")
    private String preCapPercentStr;

}

 src/main/java/com/whyc/service/ExcelExportService.java

@@ -101,6 +101,11 @@
            float bv = Float.parseFloat(data.getBv());
            float br = Float.parseFloat(data.getBr());
            float cr = Float.parseFloat(data.getCr());
            //计算容量百分比,并回填到dataList中
            float preCap = MathUtil.getPreCapTest(br, stdRes);
            String preCapStr = NumberFormat.getPercentInstance().format(preCap);
            data.setPreCapPercentStr(preCapStr);

            if (bv!=0.0){
                battVolTestCount++;
            }

 src/main/resources/excel_templates/res_test_report_single_template.xls

Binary files differ

 src/main/resources/excel_templates/res_test_report_single_template_en.xls

Binary files differ