From f81f36244507ab45dab6a0550ebee3c34cc37a6a Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 10 六月 2025 15:34:38 +0800
Subject: [PATCH] 本年度未放电数量统计(1.2.6)
---
src/main/java/com/whyc/dto/Statistic/DisChargeStic.java | 1 +
src/main/java/com/whyc/dto/Statistic/SticDischarge6Res.java | 1 +
src/main/java/com/whyc/service/BatttestdataInfService.java | 10 +++++++++-
3 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/dto/Statistic/DisChargeStic.java b/src/main/java/com/whyc/dto/Statistic/DisChargeStic.java
index 5d7a152..ae9496e 100644
--- a/src/main/java/com/whyc/dto/Statistic/DisChargeStic.java
+++ b/src/main/java/com/whyc/dto/Statistic/DisChargeStic.java
@@ -21,4 +21,5 @@
private Integer pageNum;
private Integer pageSize;
private List<Integer> typeList; //鍋滄鍘熷洜闆嗗悎
+ private Integer stopReasonType; //0鍏ㄩ儴锛�1绗﹀悎绛涢�夋潯浠剁殑鏀剧數璁板綍
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/dto/Statistic/SticDischarge6Res.java b/src/main/java/com/whyc/dto/Statistic/SticDischarge6Res.java
index 2de1c2a..686b037 100644
--- a/src/main/java/com/whyc/dto/Statistic/SticDischarge6Res.java
+++ b/src/main/java/com/whyc/dto/Statistic/SticDischarge6Res.java
@@ -21,4 +21,5 @@
private Integer errorNum;
private List<String> stopList;
private BatttestdataInf tinf;
+ private Integer stopReasonType; //0鍏ㄩ儴锛�1绗﹀悎绛涢�夋潯浠剁殑鏀剧數璁板綍
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index 371e46d..ae214af 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -738,10 +738,16 @@
res.setProduct(binf.getProduct());
//鑾峰彇鐢垫睜缁勬湭鏀剧數璁板綍(鎸囧畾鏃堕棿娈电殑鏍囧噯鏍稿鏀剧數)
getNoDischargeData(binf.getBattgroupId(),stic.getTestStartTime(),stic.getTestEndTime(),stic.getTypeList(),res);
- reslist.add(res);
//2.鑾峰彇鐢垫睜缁勫湪缁欏畾鏃堕棿娈电殑鏀剧數璁板綍(鎸囧畾鏃堕棿娈电殑鏍囧噯鏍稿鏀剧數)
BatttestdataInf tinf =getLastStandardTestDataByTime(binf.getBattgroupId(),stic.getTestStartTime(),stic.getTestEndTime());
res.setTinf(tinf);
+ if(stic.getStopReasonType()==0){
+ reslist.add(res);
+ }else {
+ if(res.getStopReasonType()==stic.getStopReasonType()){
+ reslist.add(res);
+ }
+ }
if(tinf==null){
if(!groupName.equals("none")){
BanZu bz= (BanZu) map.get(groupName);
@@ -767,6 +773,7 @@
List<String> stopList=new ArrayList<>();
if(tinfList!=null&&tinfList.size()>0){
res.setErrorNum(tinfList.size());
+ res.setStopReasonType(1);
for (BatttestdataInf tinf:tinfList) {
String stopReason=StopReasonEnum.getValue(tinf.getTestStoptype());
stopList.add(stopReason);
@@ -775,6 +782,7 @@
}else {
res.setErrorNum(0);
res.setStopList(new ArrayList<>());
+ res.setStopReasonType(0);
}
}
//鑾峰彇鏍稿鍋滄鍘熷洜绫诲瀷(涓嬫媺)
--
Gitblit v1.9.1