From 029cac7aa07914999f7bf85a1e052ae1c4421772 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期三, 21 五月 2025 17:34:00 +0800
Subject: [PATCH] 增加导入模板下载接口
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 8bbf341..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){
@@ -592,7 +593,7 @@
}
List<ApsResourceDateStat> tempList = new ArrayList<>(dayMap.values());
HashMap<String, List<ApsResourceDateStat>> temp = new HashMap<>();
- temp.put(processName + "-" + plant, tempList);
+ temp.put(processName + "_" + plant, tempList);
processList.add(temp);
}
} else {
--
Gitblit v1.9.3