From 9cd4074a456fd5c422506279191b6015836347e5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 30 十月 2026 10:08:35 +0800
Subject: [PATCH] feat: 设备台账启用状态、审批签核展示与导入健壮性
---
src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java
index 5826fa7..89f33ac 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java
@@ -67,6 +67,7 @@
if (StringUtils.isNotBlank(inspectionTaskDto.getInspectionProject())) {
queryWrapper.like(InspectionTask::getInspectionProject, inspectionTaskDto.getInspectionProject());
}
+ queryWrapper.orderByDesc(InspectionTask::getCreateTime);
IPage<InspectionTask> entityPage = inspectionTaskMapper.selectPage(page, queryWrapper);
// 鏃犳暟鎹彁鍓嶈繑鍥�
@@ -160,6 +161,7 @@
}
}
validateInspectionInput(inspectionTaskDto, oldInspectionTask);
+ validateDeviceExists(inspectionTaskDto, oldInspectionTask);
InspectionTask inspectionTask = new InspectionTask();
BeanUtils.copyProperties(inspectionTaskDto, inspectionTask);
@@ -189,6 +191,24 @@
return i;
}
+ private void validateDeviceExists(InspectionTaskDto inspectionTaskDto, InspectionTask oldInspectionTask) {
+ Integer taskId = inspectionTaskDto.getTaskId();
+ if (taskId == null && oldInspectionTask != null) {
+ taskId = oldInspectionTask.getTaskId();
+ }
+ if (taskId == null || taskId <= 0) {
+ return;
+ }
+ DeviceLedger deviceLedger = deviceLedgerMapper.selectById(taskId.longValue());
+ if (deviceLedger == null) {
+ throw new IllegalArgumentException("鎵�閫夎澶囦笉瀛樺湪锛岃閲嶆柊閫夋嫨");
+ }
+ boolean deviceChanged = oldInspectionTask == null || !Objects.equals(oldInspectionTask.getTaskId(), taskId);
+ if (deviceChanged && Integer.valueOf(0).equals(deviceLedger.getIsEnabled())) {
+ throw new IllegalArgumentException("鎵�閫夎澶囧凡鍋滅敤锛屼笉鑳藉畨鎺掑贰妫�");
+ }
+ }
+
private void validateInspectionInput(InspectionTaskDto inspectionTaskDto, InspectionTask oldInspectionTask) {
String inspectionResult = inspectionTaskDto.getInspectionResult();
if (StringUtils.isBlank(inspectionResult) && oldInspectionTask != null) {
--
Gitblit v1.9.3