From 962d64e8e4c6e34b65d188d3caf3b43c181e076d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 九月 2024 16:35:10 +0800
Subject: [PATCH] 过程图返回报备标识
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index 6d34d35..4c26051 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -763,17 +763,21 @@
Date now = new Date();
if (Objects.nonNull(beforeRecord)) {
- if (beforeRecord.getStartCreateTime().after(now)) {
+ if (now.before(beforeRecord.getBeginCreateTime())) {
process.setBeforeReportMsg("浜嬪墠鎶ュ宸插け鏁�");
- } else if (beforeRecord.getEndCreateTime().before(now)){
+ } else if (now.after(beforeRecord.getEndCreateTime())){
process.setBeforeReportMsg("浜嬪墠鎶ュ鏈敓鏁�");
+ } else {
+ process.setBeforeReportMsg("宸蹭簨鍓嶆姤澶�");
}
}
if (Objects.nonNull(afterRecord)) {
- if (afterRecord.getStartCreateTime().after(now)) {
+ if (now.before(afterRecord.getBeginCreateTime())) {
process.setAfterReportMsg("浜嬪悗鎶ュ宸插け鏁�");
- } else if (afterRecord.getEndCreateTime().before(now)){
+ } else if (now.after(afterRecord.getEndCreateTime())){
process.setAfterReportMsg("浜嬪悗鎶ュ鏈敓鏁�");
+ } else {
+ process.setAfterReportMsg("宸蹭簨鍚庢姤澶�");
}
}
return Result.ok().data(process);
--
Gitblit v1.8.0