From e3bd647305c6f4e1c8c901741932deda10a8db34 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期三, 21 五月 2025 16:13:00 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 4cb5c0a..756bec0 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
@@ -476,7 +476,8 @@
}
ApsGasPipingRouteStat queryStatParam = new ApsGasPipingRouteStat();
BeanUtils.copyProperties(apsGasPipingRouteStat,queryStatParam);
- queryStatParam.setMajor("");
+ queryStatParam.setMajor(apsGasPipingRouteStat.getMajor());
+ queryStatParam.setPlant(apsGasPipingRouteStat.getPlant());
apsGasPipingRouteStats = apsGasPipingRouteStatMapper.selectApsGasPipingRouteStatList(queryStatParam);
//鏍规嵁寮�宸ユ棩杩涜鍗囧簭鎺掑簭
apsGasPipingRouteStats.sort((a, b)->a.getProcessPlanStartDay().compareTo(b.getProcessPlanStartDay()));
@@ -538,7 +539,7 @@
String dateKey = apsResourceDateStat.getPlanDay().toString();
if(dayMap.containsKey(dateKey)){
ApsResourceDateStat apsResourceDateStatTemp = dayMap.get(dateKey);
- String capacityKey = processName + "-" + dateKey.substring(0,7);
+ String capacityKey = processName + "-"+ apsResourceDateStat.getPlant() + "-" + dateKey.substring(0,7);
apsResourceDateStatTemp.setDesignTimes(apsGasPipingPlanMap.get(capacityKey)!=null?apsGasPipingPlanMap.get(capacityKey).getDayProduceAllNum():new BigDecimal(0));
apsResourceDateStatTemp.setRequireTimes(apsResourceDateStatTemp.getRequireTimes().add(apsResourceDateStat.getRequireTimes()));
if(apsResourceDateStatTemp.getDesignTimes().compareTo(BigDecimal.ZERO) > 0){
--
Gitblit v1.9.3