From a6609b79468c5abd342e72382647cafb91ea5454 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 10 六月 2025 15:06:47 +0800
Subject: [PATCH] 本年度未放电数量统计(1.2.6)
---
src/main/java/com/whyc/service/BatttestdataInfService.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index 7dbf755..2e30590 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -731,10 +731,16 @@
res.setCountry(binf.getCountry());
res.setStationName(binf.getStationName());
res.setBattgroupName(binf.getBattgroupName());
+ res.setMoncapstd(binf.getMoncapstd());
+ res.setMonvolstd(binf.getMonvolstd());
+ res.setMoncount(binf.getMoncount());
+ 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(tinf==null){
if(!groupName.equals("none")){
BanZu bz= (BanZu) map.get(groupName);
@@ -752,13 +758,19 @@
}
}
PageInfo pageInfo=PageInfoUtils.list2PageInfo(reslist, stic.getPageNum(), stic.getPageSize());
- return new Response().setII(1,reslist.size()>0,pageInfo,"鏈勾搴︽湭鏀剧數鏁伴噺缁熻");
+ return new Response().setIII(1,reslist.size()>0,pageInfo,map,"鏈勾搴︽湭鏀剧數鏁伴噺缁熻");
}
//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<String> stopList=new ArrayList<>();
if(tinfList!=null&&tinfList.size()>0){
res.setErrorNum(tinfList.size());
+ for (BatttestdataInf tinf:tinfList) {
+ String stopReason=StopReasonEnum.getValue(tinf.getTestStoptype());
+ stopList.add(stopReason);
+ }
+ res.setStopList(stopList);
}else {
res.setErrorNum(0);
res.setStopList(new ArrayList<>());
--
Gitblit v1.9.1