From f729f1cf24e08eba181e685f0a091e7522581242 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 19 六月 2025 08:29:26 +0800
Subject: [PATCH] 未放电统计不要统计方式（放电停止原因）
---
src/main/java/com/whyc/dto/Statistic/DisChargeStic.java | 4 ++--
src/main/java/com/whyc/service/BatttestdataInfService.java | 13 +++++++------
src/main/java/com/whyc/controller/StatisticController.java | 4 ++--
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/whyc/controller/StatisticController.java b/src/main/java/com/whyc/controller/StatisticController.java
index 5b377c9..9761ee3 100644
--- a/src/main/java/com/whyc/controller/StatisticController.java
+++ b/src/main/java/com/whyc/controller/StatisticController.java
@@ -81,11 +81,11 @@
public Response getDischr6Statistic(@RequestBody DisChargeStic stic){
User uinf= ActionUtil.getUser();
stic.setUid(uinf.getId());
- if(stic.getTypeList()==null||stic.getTypeList().size()==0){
+ /*if(stic.getTypeList()==null||stic.getTypeList().size()==0){
stic.setStopReasonType(0);
}else{
stic.setStopReasonType(1);
- }
+ }*/
return battTinfService.getDischr6Statistic(stic);
}
@ApiOperation(value = "浼樿壇鐢垫簮鏁伴噺缁熻(1.2.7)")
diff --git a/src/main/java/com/whyc/dto/Statistic/DisChargeStic.java b/src/main/java/com/whyc/dto/Statistic/DisChargeStic.java
index ae9496e..fabbc0a 100644
--- a/src/main/java/com/whyc/dto/Statistic/DisChargeStic.java
+++ b/src/main/java/com/whyc/dto/Statistic/DisChargeStic.java
@@ -20,6 +20,6 @@
private Date testEndTime;//缁撴潫鏃堕棿
private Integer pageNum;
private Integer pageSize;
- private List<Integer> typeList; //鍋滄鍘熷洜闆嗗悎
- private Integer stopReasonType; //0鍏ㄩ儴锛�1绗﹀悎绛涢�夋潯浠剁殑鏀剧數璁板綍
+ private List<Integer> typeList; //鍋滄鍘熷洜闆嗗悎 銆婃潯浠跺純涔嬨��
+ 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 ed4de41..47c4a55 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -760,14 +760,15 @@
res.setBattgroupId(binf.getBattgroupId());
res.setDevId(binf.getDevId());
//鑾峰彇鐢垫睜缁勬湭鏀剧數璁板綍(鎸囧畾鏃堕棿娈电殑鏍囧噯鏍稿鏀剧數)
- getNoDischargeData(binf.getBattgroupId(),stic.getTestStartTime(),stic.getTestEndTime(),stic.getTypeList(),res);
- if(stic.getStopReasonType()==0){
+ getNoDischargeData(binf.getBattgroupId(),stic.getTestStartTime(),stic.getTestEndTime(),null,res);
+ /*if(stic.getStopReasonType()==0){
reslist.add(res);
}else {
if(res.getStopReasonType()==stic.getStopReasonType()){
reslist.add(res);
}
- }
+ }*/
+ reslist.add(res);
if(!groupName.equals("none")){
BanZu bz= (BanZu) bzmap.get(groupName);
int nochargeNum=bz.getNochargeNum();
@@ -780,11 +781,11 @@
}
//2.鑾峰彇鐢垫睜缁勬湭鏀剧數璁板綍(鎸囧畾鏃堕棿娈电殑鏍囧噯鏍稿鏀剧數)
private void getNoDischargeData(Integer battgroupId, Date testStartTime, Date testEndTime, List<Integer> typeList, SticDischarge6Res res) {
- List<BatttestdataInf> tinfList=mapper.getNoDischargeData(battgroupId,testStartTime,testEndTime,typeList);
+ List<BatttestdataInf> tinfList=mapper.getNoDischargeData(battgroupId,testStartTime,testEndTime,null);
List<String> stopList=new ArrayList<>();
if(tinfList!=null&&tinfList.size()>0){
res.setErrorNum(tinfList.size());
- res.setStopReasonType(1);
+ //res.setStopReasonType(1);
for (int i=0;i<tinfList.size();i++) {
BatttestdataInf tinf=tinfList.get(i);
if(i==0){
@@ -807,7 +808,7 @@
}else {
res.setErrorNum(0);
res.setStopList(new ArrayList<>());
- res.setStopReasonType(0);
+ //res.setStopReasonType(0);
}
}
//鑾峰彇鏍稿鍋滄鍘熷洜绫诲瀷(涓嬫媺)
--
Gitblit v1.9.1