From e1929dddde64e28f7078b403db9d37afa90ce9ce Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期二, 29 四月 2025 21:15:13 +0800
Subject: [PATCH] 更新：气柜管路产能负载：统计 需求产能 不根据专业进行过滤
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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 53070f7..ea0b10f 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
@@ -21,6 +21,7 @@
import org.apache.poi.xssf.streaming.SXSSFRow;
import org.apache.poi.xssf.streaming.SXSSFSheet;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -28,12 +29,11 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.YearMonth;
-import java.time.ZoneId;
+import java.time.*;
import java.time.format.DateTimeFormatter;
import java.util.*;
+
+import static java.util.stream.Collectors.groupingBy;
/**
* 姘斾綋绠¤矾浜ц兘璐熻浇缁熻Service涓氬姟灞傚鐞�
@@ -166,7 +166,7 @@
//宸ュ簭鍚嶇О
apsGasPipingRouteStat.setProcessName(apsProcessRoute.getProcessName());
//宸ュ簭鍙�
- apsGasPipingRouteStat.setRoadProcessNumber(apsProcessRoute.getProcessNumber());
+ apsGasPipingRouteStat.setRoadProcessNumber( new BigDecimal(apsProcessRoute.getProcessNumber()) );
//鏍囧噯宸ユ椂
apsGasPipingRouteStat.setStandardTime(apsProcessRoute.getStandardTime());
//涓撲笟
@@ -303,7 +303,10 @@
formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
simpleDateFormat = new SimpleDateFormat("yyyy-MM");
}
- apsGasPipingRouteStats = apsGasPipingRouteStatMapper.selectApsGasPipingRouteStatList(apsGasPipingRouteStat);
+ ApsGasPipingRouteStat queryStatParam = new ApsGasPipingRouteStat();
+ BeanUtils.copyProperties(apsGasPipingRouteStat,queryStatParam);
+ queryStatParam.setMajor("");
+ apsGasPipingRouteStats = apsGasPipingRouteStatMapper.selectApsGasPipingRouteStatList(queryStatParam);
//鏍规嵁寮�宸ユ棩杩涜鍗囧簭鎺掑簭
apsGasPipingRouteStats.sort((a, b)->a.getProcessPlanStartDay().compareTo(b.getProcessPlanStartDay()));
//宸ュ簭寮�宸ユ棩鏈�
@@ -705,7 +708,7 @@
}
// 鎵归噺鎻掑叆浠ユ彁楂樻�ц兘
if (!cptStateList.isEmpty()) {
- int batchSize = 500;
+ int batchSize = 1000;
int size = cptStateList.size();
for (int i = 0; i < size; i += batchSize) {
int end = Math.min(i + batchSize, size);
--
Gitblit v1.9.3