From 2bdd525d521205f0106c6008f4e8e14d7b8051f6 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 01 十二月 2025 09:17:50 +0800
Subject: [PATCH] 订单工艺属性提交
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 76a1175..9049abc 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
@@ -972,14 +972,14 @@
}
String inputVal= (String) dates.get("inputVal");
String project= (String) dates.get("project");
- String terminationVals= dates.get("terminationVals").toString();
- if (inputVal==null) {
+ String terminationVals= (String) dates.get("terminationVals");
+ if ("null".equals(inputVal)) {
inputVal = "";
}
- if (project==null) {
+ if ("null".equals(project)) {
project = "";
}
- if (terminationVals==null) {
+ if ("null".equals(terminationVals)) {
terminationVals = "";
}
List<WorkInProgressDTO> dataList1 =reportMapper.exportWorkInProgressMp(process,inputVal,project,terminationVals);
@@ -1243,14 +1243,14 @@
}
String inputVal= (String) dates.get("inputVal");
String project= (String) dates.get("project");
- String terminationVals= dates.get("terminationVals").toString();
- if (inputVal==null) {
+ String terminationVals= (String) dates.get("terminationVals");
+ if ("null".equals(inputVal)) {
inputVal = "";
}
- if (project==null) {
+ if ("null".equals(project)) {
project = "";
}
- if (terminationVals==null) {
+ if ("null".equals(terminationVals)) {
terminationVals = "";
}
--
Gitblit v1.8.0