From e7986ae5cee9034ec03ca6541775f4f7c30de146 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期一, 28 四月 2025 21:20:32 +0800
Subject: [PATCH] 【UPDATE-BUGFIX】修改获取设计产能数BUG
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java
index 092a6be..325eb6e 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java
@@ -328,8 +328,8 @@
}
apsResourceDateStatTemp.setRequireTimes(apsResourceDateStatTemp.getRequireTimes().add(apsResourceDateStat.getRequireTimes()));
if(apsResourceDateStatTemp.getDesignTimes().compareTo(BigDecimal.ZERO) > 0){
- apsResourceDateStat.setCapacityLoad(apsResourceDateStat.getRequireTimes()
- .divide(apsResourceDateStat.getDesignTimes(), 2, RoundingMode.HALF_UP)
+ apsResourceDateStatTemp.setCapacityLoad(apsResourceDateStatTemp.getRequireTimes()
+ .divide(apsResourceDateStatTemp.getDesignTimes(), 2, RoundingMode.HALF_UP)
.multiply(new BigDecimal(100)));
}else{
apsResourceDateStatTemp.setCapacityLoad(new BigDecimal(0));
@@ -357,9 +357,12 @@
for (Map.Entry<String, List<ApsResourceDateStat>> entry : temp.entrySet()){
List<ApsResourceDateStat> apsResourceDateStatList = entry.getValue();
String key = entry.getKey();
- LocalDate crtDate=LocalDate.parse(key, formatter);
+ List<ApsResourceDateStat> crtList = new ArrayList<>();
for(String tempTime:sortedStartPlanTimeList) {
- List<ApsResourceDateStat> crtList = new ArrayList<>();
+ if("month".equals(apsGasPipingRouteStat.getSearchType())){
+ tempTime += "-01";
+ }
+ LocalDate crtDate = LocalDate.parse(tempTime, formatter);
Optional<ApsResourceDateStat> first = apsResourceDateStatList.stream().filter(x -> x.getPlanDay().equals(crtDate)).findFirst();
if (first.isPresent()) {
ApsResourceDateStat apsResourceDateStat = first.get();
--
Gitblit v1.9.3