From 834fd9864797c34489d5c3acfc7cc6bcb30ad31c Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 04 六月 2025 10:53:06 +0800
Subject: [PATCH] 单体统计修改
---
src/main/java/com/whyc/service/BatttestdataInfService.java | 3 +++
src/main/java/com/whyc/dto/Statistic/SticMonRes.java | 1 +
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/dto/Statistic/SticMonRes.java b/src/main/java/com/whyc/dto/Statistic/SticMonRes.java
index b447b9e..fc606b7 100644
--- a/src/main/java/com/whyc/dto/Statistic/SticMonRes.java
+++ b/src/main/java/com/whyc/dto/Statistic/SticMonRes.java
@@ -5,6 +5,7 @@
@Data
public class SticMonRes {
private Integer battgroupId;
+ private String battgroupName;
private Integer monNum;
private Float monVol;
private Float monRes;
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index aec61ec..078f9bc 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -163,6 +163,7 @@
realCap = (float) BattCapFactory.GetMonomerCap(tinf.getTestCap(), hourRate, tinf.getTestCap(), tinf.getMaxMonvol(),data.getMonVol() , tinf.getGroupVol(), BattCapFactory.CapType_Real);
SticMonRes res=new SticMonRes();
res.setBattgroupId(binf.getBattgroupId());
+ res.setBattgroupName(binf.getBattgroupName());
res.setMonNum(data.getMonNum());
//鑾峰彇鍗曚綋鐨勫疄鏃舵暟鎹�
BattRtdata rtdata=rtdataService.getRtdataByNum(binf.getBattgroupId(),data.getMonNum());
@@ -200,6 +201,7 @@
for (int i=0;i<binf.getMoncount();i++){
SticMonRes res=new SticMonRes();
res.setBattgroupId(binf.getBattgroupId());
+ res.setBattgroupName(binf.getBattgroupName());
res.setMonNum(i+1);
res.setMonVol(0f);
res.setMonRes(0f);
@@ -209,6 +211,7 @@
for (BattRtdata rtdata:rtdataList) {
SticMonRes res=new SticMonRes();
res.setBattgroupId(binf.getBattgroupId());
+ res.setBattgroupName(binf.getBattgroupName());
res.setMonNum(rtdata.getMonNum());
res.setMonVol(rtdata.getMonVol());
res.setMonRes(rtdata.getMonRes());
--
Gitblit v1.9.1