From 3247273b3505b42c400251ee2fc0921affaadf40 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 29 十二月 2025 16:40:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
index ad0c82b..1fb973b 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
@@ -209,17 +209,19 @@
.eq("basic_name",uniqueList.get(i).get("process"))
.last("limit 1")
);
+ if(basicData!=null){
+ //鍒ゆ柇澶硅兌鍜屽す鑳跺悗宸ュ簭
+ //Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")
+ if(Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")){
+ clos.put(uniqueList.get(i).get("process"), 15+i);
+ }
+ //鍒ゆ柇涓┖鍜屼腑绌哄悗宸ュ簭
+ //Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")
+ if(Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")){
+ columns.add("reportWorkQuantity."+uniqueList.get(i).get("process"));
+ }
+ }
- //鍒ゆ柇澶硅兌鍜屽す鑳跺悗宸ュ簭
- //Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")
- if(Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")){
- clos.put(uniqueList.get(i).get("process"), 15+i);
- }
- //鍒ゆ柇涓┖鍜屼腑绌哄悗宸ュ簭
- //Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")
- if(Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")){
- columns.add("reportWorkQuantity."+uniqueList.get(i).get("process"));
- }
}
--
Gitblit v1.8.0