From ee0934f03c4af4967d1bfaf5dfbfcd28d5203d93 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期一, 28 八月 2023 16:41:47 +0800
Subject: [PATCH] 5种充放电类型统计过滤
---
src/main/java/com/whyc/service/BatttestdataInfService.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index ade28f7..90116c8 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -416,6 +416,7 @@
}
}*/
public Map<String, Integer> analysisTestData(List<BatttestdataInf> list) {
+ List<PageParam> pageParamList = pageParamService.getList2ByCategoryId(14);
Map<String, Integer> map = new HashMap<>();
int hrdisNum = 0;//鏍稿鏀剧數
int jcdisNum = 0;//鐩戞祴鏀剧數
@@ -436,7 +437,9 @@
dddisNum += 1;
}
if (tinf.getTestDatatype() == 0) {
- jcdisNum += 1;
+ if(tinf.getTestTimelong()>=pageParamList.get(2).getStatus()*60) {
+ jcdisNum += 1;
+ }
}
}
} else if (tinf.getTestType() == 2) {
@@ -444,7 +447,9 @@
if (tinf.getTestStarttype() == 3) {
hrchNum += 1;
} else {
- jcchNum += 1;
+ if(tinf.getTestTimelong()>=pageParamList.get(3).getStatus()*60) {
+ jcchNum += 1;
+ }
}
}
}
--
Gitblit v1.9.1