From b079a1727af6eeb2ebcfc44190a9b72a454d4f12 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期五, 25 四月 2025 22:56:52 +0800
Subject: [PATCH] 【ADD】增加气体管路产能统计相关代码
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java
index dcd9d9c..4009b5e 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java
@@ -394,8 +394,23 @@
- int i1 = 17;
- for (int i = 0; i < shopNames.size(); i++) {
+ int i1 = 18;
+
+ String firstShopName = shopNames.get(0);
+ SXSSFCell firstShopBeginDateTitle = rowTitle.createCell(17);
+ firstShopBeginDateTitle.setCellValue(firstShopName+"寮�宸ユ椂闂�");
+ firstShopBeginDateTitle.setCellStyle(title);
+ SXSSFCell firstShopEndDateTitle = rowTitle.createCell(18);
+ firstShopEndDateTitle.setCellValue(firstShopName+"瀹屽伐鏃堕棿");
+ firstShopEndDateTitle.setCellStyle(title);
+
+ /*鐒婃帴浠堕綈濂�*/
+ SXSSFCell hanJieQiTaoTitle= rowTitle.createCell(19);
+ hanJieQiTaoTitle.setCellValue("鐒婃帴浠堕綈濂楀紑濮嬫椂闂�");
+ hanJieQiTaoTitle.setCellStyle(title);
+
+
+ for (int i = 1; i < shopNames.size(); i++) {
String shopName = shopNames.get(i);
SXSSFCell beginDateCell = rowTitle.createCell(i * 2 + i1);
SXSSFCell endDateCell = rowTitle.createCell(i * 2 + i1+1);
@@ -478,7 +493,22 @@
SXSSFCell planEndDayCell = dataRow.createCell(16);
planEndDayCell.setCellValue(dateFormat.format(plan.getPlanEndDay()));
- for (int j = 0; j< shopNames.size(); j++) {
+
+
+
+ SXSSFCell firstShopBeginDateCell = dataRow.createCell(17);
+ SXSSFCell firstShopEndDateCell = dataRow.createCell(18);
+
+ plan.getDeptPlans().stream().filter(x->x.getShopName().equals(firstShopName)).findFirst().ifPresent(x->{
+ firstShopBeginDateCell.setCellValue(x.getPlanStartDate());
+ firstShopEndDateCell.setCellValue(x.getPlanEndDate());
+ });
+ /*鐒婃帴浠堕綈濂�*/
+ SXSSFCell hanJieQiTaoCell = dataRow.createCell(19);
+ hanJieQiTaoCell.setCellValue("");
+
+
+ for (int j = 1; j< shopNames.size(); j++) {
String shopName = shopNames.get(j);
SXSSFCell beginDateCell = dataRow.createCell(j * 2 + i1);
SXSSFCell endDateCell = dataRow.createCell(j * 2 + i1+1);
--
Gitblit v1.9.3