From 0723f31c8823e51449bd2e34f4b26a75f9e9cd2b Mon Sep 17 00:00:00 2001
From: PerryHsu <perryhsu@163.com>
Date: 星期一, 26 十二月 2022 01:53:27 +0800
Subject: [PATCH] 单数据导出逻辑更换
---
src/main/java/com/whyc/service/BattGroupDataService.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattGroupDataService.java b/src/main/java/com/whyc/service/BattGroupDataService.java
index ba8093c..9cb4ced 100644
--- a/src/main/java/com/whyc/service/BattGroupDataService.java
+++ b/src/main/java/com/whyc/service/BattGroupDataService.java
@@ -71,9 +71,12 @@
volLowCoeK1 = param2.getVol6LowCoeK1();
volHighCoeK2 = param2.getVol6HighCoeK2();
}
- else{
+ else if(param.getBattVol() == 12){
volLowCoeK1 = param2.getVol12LowCoeK1();
volHighCoeK2 = param2.getVol12HighCoeK2();
+ }else{ //鐢靛帇闈炲父瑙勫��,鍒欓粯璁よ缃负2v鐨勭數鍘嬮槇鍊�
+ volLowCoeK1 = param2.getVol2LowCoeK1();
+ volHighCoeK2 = param2.getVol2HighCoeK2();
}
Float resGoodCoeK3 = param2.getResGoodCoeK3();
Float resBadCoeK4 = param2.getResBadCoeK4();
@@ -86,9 +89,9 @@
Float bv = Float.parseFloat(data.getBv());
Float cr = Float.parseFloat(data.getCr()); //杩炴帴鏉￠樆鎶�
- if(bv!=0.0 && bv < finalVolLowCoeK){
+ if(bv!=0.0 && bv <= finalVolLowCoeK){
data.setLowVolFlag(true);
- }else if(bv > finalVolHighCoeK){
+ }else if(bv >= finalVolHighCoeK){
data.setHighVolFlag(true);
}
--
Gitblit v1.9.1