From 6548d360f538c5a67c97bb7477b00ab807bf3fbe Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期五, 02 十二月 2022 11:32:01 +0800
Subject: [PATCH] 单数据和对比数据导出更新
---
src/main/java/com/whyc/service/BattGroupDataService.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattGroupDataService.java b/src/main/java/com/whyc/service/BattGroupDataService.java
index 308cd39..ba8093c 100644
--- a/src/main/java/com/whyc/service/BattGroupDataService.java
+++ b/src/main/java/com/whyc/service/BattGroupDataService.java
@@ -86,22 +86,22 @@
Float bv = Float.parseFloat(data.getBv());
Float cr = Float.parseFloat(data.getCr()); //杩炴帴鏉￠樆鎶�
- if(bv < finalVolLowCoeK){
+ if(bv!=0.0 && bv < finalVolLowCoeK){
data.setLowVolFlag(true);
}else if(bv > finalVolHighCoeK){
data.setHighVolFlag(true);
}
- if(br > stdRes*resGoodCoeK3/100){
- if(br > stdRes*resBadCoeK4/100){
+ if(br >= stdRes*resGoodCoeK3/100){
+ if(br >= stdRes*resBadCoeK4/100){
data.setHighResFlag2(true);
}else{
data.setHighResFlag1(true);
}
}
- if(cr > chainRes*param2.getChainResCoeK5()/100){
- if(cr > chainRes*param2.getChainResChange()/100) {
+ if(cr >= chainRes*param2.getChainResCoeK5()/100){
+ if(cr >= chainRes*param2.getChainResChange()/100) {
data.setHighChainResFlag2(true);
}else {
data.setHighChainResFlag1(true);
--
Gitblit v1.9.1