From 6ab1565a1a86623af925719935d605e875d98af4 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 23 十月 2026 18:08:56 +0800
Subject: [PATCH] 设备核查计划：设备档案变更即时登记计划明细，提前核查复用待核查明细并回写档案，已完成记录不可覆盖；新增附件字段、明细固定排序与删除保护；人员查询新增包含admin的类型；检验保存/提交按页面模板校验，复核驳回按检验室删除复核人
---
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
index 7220c40..58dd316 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.pojo.DeviceMaintenance;
+import com.ruoyi.device.service.DeviceMaintenancePlanService;
import com.ruoyi.device.service.DeviceMaintenanceService;
import com.ruoyi.system.mapper.UserMapper;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -27,6 +28,9 @@
@Autowired
private UserMapper userMapper;
+
+ @Autowired
+ private DeviceMaintenancePlanService deviceMaintenancePlanService;
/**
@@ -55,7 +59,12 @@
User user = userMapper.selectById(deviceMaintenance.getMaintenanceUserId());
deviceMaintenance.setMaintenanceUserName(user.getName());
- return Result.success(deviceMaintenanceService.saveOrUpdate(deviceMaintenance));
+ boolean saved = deviceMaintenanceService.saveOrUpdate(deviceMaintenance);
+ // 淇濆吇瀹屾垚鍚庯紝鎶婅澶囨。妗堢殑鏈�杩�/涓嬫淇濆吇鏃ユ湡婊氬姩鍒版湰杞�
+ if (saved && deviceMaintenance.getMaintenanceDate() != null) {
+ deviceMaintenancePlanService.updateDeviceMaintenanceDate(deviceMaintenance.getDeviceId(), deviceMaintenance.getMaintenanceDate());
+ }
+ return Result.success(saved);
}
/**
--
Gitblit v1.9.3