From 61d2cc8a474fd42f1afb50761fe8de87ce891048 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 23 四月 2025 18:28:39 +0800
Subject: [PATCH] 钣金按部门统计时间
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 dcaec74..5c83891 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
@@ -189,8 +189,9 @@
if (!processNames.isEmpty()) {
// 鏍规嵁宸ュ簭鍚嶇О锛屾煡璇㈣宸ュ崟涓嬫墍鏈夌殑宸ュ簭淇℃伅
List<ApsPlateProcessStat> processStats = statList.stream()
- .filter(x -> processNames.contains(x.getProcessName()) && x.getWorkOrderNo().equals(plan.getDocumentNumber()))
- .toList();
+ .filter(x -> processNames.contains(x.getProcessName()) && x.getWorkOrderNo().equals(plan.getDocumentNumber())
+ &&x.getProcessPlanStartDay()!=null&&x.getProcessPlanEndDay()!=null
+ ).toList();
if (!processStats.isEmpty()) {
// 鍙栧嚭宸ュ崟涓嬪伐搴忕殑鏈�灏忓紑濮嬫椂闂村拰鏈�澶х粨鏉熸椂闂�
List<Date> startDayList = processStats.stream().map(ApsPlateProcessStat::getProcessPlanStartDay).filter(Objects::nonNull).toList();
@@ -225,6 +226,7 @@
}
} catch (Exception e) {
log.error("computer error:"+ JSONObject.toJSONString(stat));
+ throw new RuntimeException("淇濆瓨閽ｉ噾杞﹂棿缁熻澶辫触", e);
}
return stat;
}
--
Gitblit v1.9.3