From de562dee45fe7ca955a5b9ffa346bf52f772718d Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 19 九月 2024 11:03:31 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/ResMeterManager
---
src/main/java/com/whyc/service/ExcelExportService.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/service/ExcelExportService.java b/src/main/java/com/whyc/service/ExcelExportService.java
index 04a7bb2..f89ecd6 100644
--- a/src/main/java/com/whyc/service/ExcelExportService.java
+++ b/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++;
}
--
Gitblit v1.9.1