From 65af9227c2ec7ac93dfa237e635af334560fe198 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 24 六月 2025 15:37:18 +0800
Subject: [PATCH] 同一修改计算容量时用标称容量
---
src/main/java/com/whyc/service/BatttestdataIdService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/BatttestdataIdService.java b/src/main/java/com/whyc/service/BatttestdataIdService.java
index e3949e4..f0a993f 100644
--- a/src/main/java/com/whyc/service/BatttestdataIdService.java
+++ b/src/main/java/com/whyc/service/BatttestdataIdService.java
@@ -45,8 +45,8 @@
BatttestdataInf tinf=tinfService.getTinfByTestRecordCount(battgroupId,testRecordCount);
int hourRate = BattCapFactory.GetHourRate(tinf.getTestCap(), tinf.getTestCurr());
for (BatttestdataId data:list) {
- Float realCap = (float) BattCapFactory.GetMonomerCap(tinf.getTestCap(), hourRate, tinf.getTestCap(), tinf.getMaxMonvol(),data.getMonVol() , tinf.getGroupVol(), BattCapFactory.CapType_Real);
- Float restcap = (float) BattCapFactory.GetMonomerCap(tinf.getTestCap(), hourRate, tinf.getTestCap(), tinf.getMaxMonvol(), tinf.getMinMonvol(), tinf.getGroupVol(), BattCapFactory.CapType_Rest);
+ Float realCap = (float) BattCapFactory.GetMonomerCap(binf.getMoncapstd(), hourRate, tinf.getTestCap(), tinf.getMaxMonvol(),data.getMonVol() , tinf.getGroupVol(), BattCapFactory.CapType_Real);
+ Float restcap = (float) BattCapFactory.GetMonomerCap(binf.getMoncapstd(), hourRate, tinf.getTestCap(), tinf.getMaxMonvol(), tinf.getMinMonvol(), tinf.getGroupVol(), BattCapFactory.CapType_Rest);
data.setRealCap(realCap);
data.setRestCap(restcap);
data.setPercentCap(String.format("%.5f",(realCap/binf.getMoncapstd()*100)));
--
Gitblit v1.9.1