From b0dd3c0fb9a2ff0666b27e6677ff7411245d334f Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期五, 02 十二月 2022 14:26:25 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/ResMeterManager
---
src/main/java/com/whyc/service/ExcelExportService.java | 72 +++++++++++++++++++++++++++++++-----
1 files changed, 62 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/whyc/service/ExcelExportService.java b/src/main/java/com/whyc/service/ExcelExportService.java
index f2d784c..6f983f6 100644
--- a/src/main/java/com/whyc/service/ExcelExportService.java
+++ b/src/main/java/com/whyc/service/ExcelExportService.java
@@ -46,31 +46,56 @@
int resGoodCount = 0;
int volGoodCount = 0;
int chainResGoodCount = 0;
+ //鎬讳綋璇勪环:鏈夋晥鐨勭數闃�/鐢靛帇/杩炴帴鏉� 鏁�
+ int battVolTestCount = 0;
+ int battResTestCount = 0;
+ int battChainResTestCount = 0;
FileParam fileParam = info.getFileParam();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
fileParam.setTestTimeStr(format.format(fileParam.getTestTime()));
List<BattgroupData> dataList = info.getDataList();
for(BattgroupData data : dataList){
+ //璁＄畻鐢靛帇,鍐呴樆,杩炴帴鏉℃暟鍊兼槸鍚︽湁鏁�,琚祴璇曡繃
+ float bv = Float.parseFloat(data.getBv());
+ float br = Float.parseFloat(data.getBr());
+ float cr = Float.parseFloat(data.getCr());
+ if (bv!=0.0){
+ battVolTestCount++;
+ }
+ if(br!=0.0){
+ battResTestCount++;
+ }
+ if (cr!=0.0){
+ battChainResTestCount++;
+ }
+
data.setMonNumStr("#"+data.getMonNum());
- if(!data.isHighResFlag1() && !data.isHighResFlag2()){
+ if(br==0.0){
+ data.setResEvaluation("鈥�");
+ }
+ else if(!data.isHighResFlag1() && !data.isHighResFlag2()){
resGoodCount +=1;
data.setResEvaluation("浼�");
}else if(data.isHighResFlag1()){
- data.setResEvaluation("宸�");
+ data.setResEvaluation("鑹�");
}else{
- data.setResEvaluation("寰堝樊");
+ data.setResEvaluation("宸�");
}
- if(!data.isLowVolFlag() && !data.isHighVolFlag()){
+ if(bv!=0.0 && !data.isLowVolFlag() && !data.isHighVolFlag()){
volGoodCount +=1;
}
- if(!data.isHighChainResFlag1() && !data.isHighChainResFlag2()){
+ if(cr!=0.0 && !data.isHighChainResFlag1() && !data.isHighChainResFlag2()){
chainResGoodCount +=1;
}
};
info.setResGoodCount(resGoodCount);
info.setVolGoodCount(volGoodCount);
info.setChainResGoodCount(chainResGoodCount);
+
+ info.setBattVolTestCount(battVolTestCount);
+ info.setBattResTestCount(battResTestCount);
+ info.setBattChainResTestCount(battChainResTestCount);
StationInfo stationInfo = info.getStationInfo();
if(stationInfo!=null) {
@@ -186,20 +211,43 @@
int resGoodCount = 0;
int volGoodCount = 0;
int chainResGoodCount = 0;
+
+ //鎬讳綋璇勪环:鏈夋晥鐨勭數闃�/鐢靛帇/杩炴帴鏉� 鏁�
+ int battVolTestCount = 0;
+ int battResTestCount = 0;
+ int battChainResTestCount = 0;
+
for(BattgroupData data : dataList2){
+ //璁＄畻鐢靛帇,鍐呴樆,杩炴帴鏉℃暟鍊兼槸鍚︽湁鏁�,琚祴璇曡繃
+ float bv = Float.parseFloat(data.getBv());
+ float br = Float.parseFloat(data.getBr());
+ float cr = Float.parseFloat(data.getCr());
+ if (bv!=0.0){
+ battVolTestCount++;
+ }
+ if(br!=0.0){
+ battResTestCount++;
+ }
+ if (cr!=0.0){
+ battChainResTestCount++;
+ }
+
data.setMonNumStr("#"+data.getMonNum());
- if(!data.isHighResFlag1() && !data.isHighResFlag2()){
+ if(br==0.0){
+ data.setResEvaluation("鈥�");
+ }
+ else if(!data.isHighResFlag1() && !data.isHighResFlag2() ){
resGoodCount +=1;
data.setResEvaluation("浼�");
}else if(data.isHighResFlag1()){
- data.setResEvaluation("宸�");
+ data.setResEvaluation("鑹�");
}else{
- data.setResEvaluation("寰堝樊");
+ data.setResEvaluation("宸�");
}
- if(!data.isLowVolFlag() && !data.isHighVolFlag()){
+ if(bv!=0.0 && !data.isLowVolFlag() && !data.isHighVolFlag()){
volGoodCount +=1;
}
- if(!data.isHighChainResFlag1() && !data.isHighChainResFlag2()){
+ if(cr!=0.0 && !data.isHighChainResFlag1() && !data.isHighChainResFlag2()){
chainResGoodCount +=1;
}
};
@@ -207,6 +255,10 @@
map.put("volGoodCount",volGoodCount);
map.put("chainResGoodCount",chainResGoodCount);
+ map.put("battVolTestCount",battVolTestCount);
+ map.put("battResTestCount",battResTestCount);
+ map.put("battChainResTestCount",battChainResTestCount);
+
map.put("dataList",dataList);
map.put("dataList2",dataList2);
--
Gitblit v1.9.1