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/ExcelExportService.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/service/ExcelExportService.java b/src/main/java/com/whyc/service/ExcelExportService.java
index 028adeb..f9aa2a0 100644
--- a/src/main/java/com/whyc/service/ExcelExportService.java
+++ b/src/main/java/com/whyc/service/ExcelExportService.java
@@ -258,11 +258,13 @@
HashMap<String, Object> map = Maps.newHashMap();
//鎬讳綋璇勪环:鍐呴樆/鐢靛帇/杩炴帴鏉�/?瀹归噺
int resGoodCount = 0;
+ int serGoodCount = 0;
int volGoodCount = 0;
int chainResGoodCount = 0;
//鎬讳綋璇勪环:鏈夋晥鐨勭數闃�/鐢靛帇/杩炴帴鏉� 鏁�
int battVolTestCount = 0;
int battResTestCount = 0;
+ int battSerTestCount = 0;
int battChainResTestCount = 0;
FileParam param = info.getFileParam();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -296,6 +298,9 @@
}
Float resGoodCoeK3 = param2.getResGoodCoeK3();
Float resBadCoeK4 = param2.getResBadCoeK4();
+ Float serGoodCoeK6 = param2.getSerGoodCoeK6();
+ Float serBadCoeK7 = param2.getSerBadCoeK7();
+
Float chainRes = param.getVersion().toUpperCase().contains("V2.0")?param.getChainRes():param.getConnRes();
Float finalVolLowCoeK = volLowCoeK1;
Float finalVolHighCoeK = volHighCoeK2;
@@ -304,6 +309,7 @@
//璁＄畻鐢靛帇,鍐呴樆,杩炴帴鏉℃暟鍊兼槸鍚︽湁鏁�,琚祴璇曡繃
float bv = Float.parseFloat(data.getBv());
float br = Float.parseFloat(data.getBr());
+ float bs = Float.parseFloat(data.getBs());
float cr = Float.parseFloat(data.getCr());
//璁＄畻瀹归噺鐧惧垎姣�,骞跺洖濉埌dataList涓�
float preCap = MathUtil.getPreCapTest(br, stdRes);
@@ -316,6 +322,9 @@
if(br!=0.0){
battResTestCount++;
}
+ if(bs!=0.0){
+ battSerTestCount++;
+ }
if (cr!=0.0){
battChainResTestCount++;
}
@@ -324,14 +333,6 @@
if(br==0.0){
data.setResEvaluation("鈥�");
}
- /*else if(!data.isHighResFlag1() && !data.isHighResFlag2()){
- resGoodCount +=1;
- data.setResEvaluation("浼�");
- }else if(data.isHighResFlag1()){
- data.setResEvaluation("鑹�");
- }else{
- data.setResEvaluation("宸�");
- }*/
else if(br >= stdRes*resGoodCoeK3/100){
if(br >= stdRes*resBadCoeK4/100){
// data.setHighResFlag2(true);
@@ -356,6 +357,10 @@
data.setResEvaluation("excellent");
}
}
+ //System.out.println(" bs:"+bs+" ;stdRes:"+stdRes+";serGoodCoeK6:"+(1.0/stdRes)*serGoodCoeK6/100);
+ if(bs!=0.0&&bs>((1.0/stdRes)*serGoodCoeK6/100)){
+ serGoodCount +=1;
+ }
/*if(bv!=0.0 && !data.isLowVolFlag() && !data.isHighVolFlag()){
volGoodCount +=1;
}*/
@@ -372,10 +377,13 @@
info.setResGoodCount(resGoodCount);
info.setVolGoodCount(volGoodCount);
info.setChainResGoodCount(chainResGoodCount);
+ info.setSerGoodCount(serGoodCount);
info.setBattVolTestCount(battVolTestCount);
info.setBattResTestCount(battResTestCount);
+ info.setBattSerTestCount(battSerTestCount);
info.setBattChainResTestCount(battChainResTestCount);
+
StationInfo stationInfo = info.getStationInfo();
if(stationInfo!=null) {
@@ -717,24 +725,30 @@
map.put("stationInfo",stationInfo);
//鎬讳綋璇勪环:鍐呴樆/鐢靛帇/杩炴帴鏉�/?瀹归噺
int resGoodCount = 0;
+ int serGoodCount = 0;
int volGoodCount = 0;
int chainResGoodCount = 0;
//鎬讳綋璇勪环:鏈夋晥鐨勭數闃�/鐢靛帇/杩炴帴鏉� 鏁�
int battVolTestCount = 0;
int battResTestCount = 0;
+ int battSerTestCount = 0;
int battChainResTestCount = 0;
for(BattgroupData data : dataList2){
//璁＄畻鐢靛帇,鍐呴樆,杩炴帴鏉℃暟鍊兼槸鍚︽湁鏁�,琚祴璇曡繃
float bv = Float.parseFloat(data.getBv());
float br = Float.parseFloat(data.getBr());
+ float bs = Float.parseFloat(data.getBs());
float cr = Float.parseFloat(data.getCr());
if (bv!=0.0){
battVolTestCount++;
}
if(br!=0.0){
battResTestCount++;
+ }
+ if(bs!=0.0){
+ battSerTestCount++;
}
if (cr!=0.0){
battChainResTestCount++;
@@ -764,6 +778,9 @@
data.setResEvaluation("bad");
}
}
+ if(bs!=0.0&& !data.isHighSerFlag1() && !data.isHighSerFlag2()){
+ serGoodCount +=1;
+ }
if(bv!=0.0 && !data.isLowVolFlag() && !data.isHighVolFlag()){
volGoodCount +=1;
}
@@ -773,10 +790,12 @@
};
map.put("resGoodCount",resGoodCount);
map.put("volGoodCount",volGoodCount);
+ map.put("serGoodCount",serGoodCount);
map.put("chainResGoodCount",chainResGoodCount);
map.put("battVolTestCount",battVolTestCount);
map.put("battResTestCount",battResTestCount);
+ map.put("battSerTestCount",battSerTestCount);
map.put("battChainResTestCount",battChainResTestCount);
map.put("dataList",dataList);
--
Gitblit v1.9.1