From 6a8e048ed345c93210a2a99989d060b4c7d464f0 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 08 七月 2025 15:21:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderExpiredJob.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderExpiredJob.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderExpiredJob.java
index 7f309aa..fd93774 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderExpiredJob.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderExpiredJob.java
@@ -59,11 +59,8 @@
return;
}
for (EamInspectionOrder order : unCompleteOrderList) {
- if (InspectionStatus.WAIT_INSPECTION.name().equals(order.getInspectionStatus())) {
- order.setInspectionStatus(InspectionStatus.EXPIRED.name());
- } else if (InspectionStatus.UNDER_INSPECTION.name().equals(order.getInspectionStatus())) {
- //宸茬粡琚帴鍗� 浣嗘湭鎵ц瀹屾垚
- order.setInspectionStatus(InspectionStatus.EXPIRED.name());
+ order.setInspectionStatus(InspectionStatus.EXPIRED.name());
+ if (InspectionStatus.UNDER_INSPECTION.name().equals(order.getInspectionStatus())) {
//寮哄埗缁撴潫娴佺▼ 鍒犻櫎鐢ㄦ埛鐨勬寰呭姙浠诲姟
FlowMyBusiness flowMyBusiness = flowMyBusinessService.selectByDataId(order.getId());
if (flowMyBusiness != null) {
--
Gitblit v1.9.3