From 249472b25fa0711e525e36a8c403265d621099d2 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 20 六月 2025 14:38:49 +0800
Subject: [PATCH] 历史测试记录浮充电压值

---
 src/main/java/com/whyc/service/BatttestdataInfService.java        |    3 +--
 src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java |    3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java b/src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java
index 1a27f8c..60cbf70 100644
--- a/src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java
+++ b/src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java
@@ -113,6 +113,9 @@
     @ApiModelProperty(value = "灞辫タ61850鐩戞祴鏀剧數鏁版嵁鏍囪瘑銆�0锛氱洃娴嬫斁鐢碉紱1鍋滅數鏀剧數銆�")
     private Integer testDatatype;
 
+    @ApiModelProperty(value = "姝ゆ鏀剧數鍓嶇殑娴厖鐢靛帇")
+    private Float floatGroupVol;
+
     @TableField(exist = false)
     private String stationName;
 
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index 5ebae1c..e2eb5c4 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -583,13 +583,12 @@
             dto.setMoncapstd(binf.getMoncapstd());
             dto.setMonCount(binf.getMoncount());
             dto.setMonvolstd(binf.getMonvolstd());
+            dto.setFloatchartVol(tinf.getFloatGroupVol());
             if(battRtstate!=null){
                 Float restTime= BattCapFactory.getTheoryTime(battRtstate.getLoadCurr(), realCap, binf.getMoncapstd());
                 dto.setRestTime(restTime);
-                dto.setFloatchartVol(battRtstate.getGroupVol());
             }else{
                 dto.setRestTime(0f);
-                dto.setFloatchartVol(0f);
             }
             //鎵捐繖娆℃斁鐢电殑鎸囧畾涓�绗旀暟鎹�
             List<BatttestdataId> idDataList=battTestdataIdService.getLastDataByBattgroupId(tinf.getBattgroupId(),tinf.getTestRecordCount(),1);

--
Gitblit v1.9.1