From c6015b2acba3e4a60045f7f3d275618cc9e554e7 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 17:41:17 +0800
Subject: [PATCH] fix(production): 报工参数补全过滤空工单，修复报工台账查询报错
---
src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java
index 09d5d77..fbc1b15 100644
--- a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java
+++ b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java
@@ -48,6 +48,10 @@
if (timingTask == null) {
throw new JobExecutionException("MaintenanceTaskJob鎵句笉鍒板畾鏃朵换鍔�: " + taskId);
}
+ // 浠诲姟宸插仠鐢ㄦ椂涓嶇敓鎴愪繚鍏昏褰�
+ if (!timingTask.isActive()) {
+ return;
+ }
// 2. 鍒涘缓骞朵繚瀛樺贰妫�浠诲姟璁板綍 - 杩欏氨鏄偍鎻愪緵鐨勪唬鐮佸簲璇ユ斁鐨勪綅缃�
DeviceMaintenance deviceMaintenance = createInspectionTask(timingTask);
@@ -93,6 +97,7 @@
inspectionTask.setMaintenanceTaskId(timingTask.getId());
inspectionTask.setDeviceLedgerId(timingTask.getTaskId());
inspectionTask.setMaintenancePlanTime(LocalDateTime.now());
+ inspectionTask.setMaintenanceActuallyName(timingTask.getMaintenancePerson());
inspectionTask.setFrequencyType(timingTask.getFrequencyType());
inspectionTask.setFrequencyDetail(timingTask.getFrequencyDetail());
inspectionTask.setTenantId(timingTask.getTenantId());
--
Gitblit v1.9.3