From b8d60bd9e26c9505346cfa2374a5fde5cf2697ed Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 27 三月 2025 16:09:52 +0800
Subject: [PATCH] 2025-3-22定制修改导出去掉容量和连接条

---
 src/main/java/com/whyc/service/BattGroupDataService.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/whyc/service/BattGroupDataService.java b/src/main/java/com/whyc/service/BattGroupDataService.java
index 1d28b96..91609e8 100644
--- a/src/main/java/com/whyc/service/BattGroupDataService.java
+++ b/src/main/java/com/whyc/service/BattGroupDataService.java
@@ -87,6 +87,7 @@
         dataList.forEach(data->{
             //鍒ゆ柇澶勭悊闃堝��
             Float br =  Float.parseFloat(data.getBr());
+            Float bs =  Float.parseFloat(data.getBs());
             Float bv =  Float.parseFloat(data.getBv());
             Float cr =  Float.parseFloat(data.getCr()); //杩炴帴鏉¢樆鎶�
 
@@ -104,6 +105,13 @@
                 }
             }
 
+            if(bs <= (1/stdRes)*param2.getSerGoodCoeK6()/100){
+                if(bs >= chainRes*param2.getSerBadCoeK7()/100) {
+                    data.setHighSerFlag1(true);
+                }else {
+                    data.setHighSerFlag2(true);
+                }
+            }
             if(cr >= chainRes*param2.getChainResCoeK5()/100){
                 if(cr >= chainRes*param2.getChainResChange()/100) {
                     data.setHighChainResFlag2(true);

--
Gitblit v1.9.1