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/DeviceExaminePlanController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceExaminePlanController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceExaminePlanController.java
index b2aa097..208271a 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceExaminePlanController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceExaminePlanController.java
@@ -168,17 +168,27 @@
@Operation(summary = "淇敼璁惧鏍告煡璁″垝璇︽儏")
@PostMapping("/updateDeviceExaminePlanDetail")
public Result updateDeviceExaminePlanDetail(@RequestBody DeviceExaminePlanDetails deviceExaminePlanDetail){
- return Result.success(deviceExaminePlanDetailsService.updateById(deviceExaminePlanDetail));
+ return Result.success(deviceExaminePlanService.updateExaminePlanDetail(deviceExaminePlanDetail));
}
/**
- * 鍒犻櫎璁惧鏍告煡璁″垝璇︽儏
+ * 鍒犻櫎璁惧鏍告煡璁″垝璇︽儏锛堝凡鏈夋牳鏌ヨ褰曠殑涓嶅厑璁稿垹闄わ級
* @return
*/
@Operation(summary = "鍒犻櫎璁惧鏍告煡璁″垝璇︽儏")
@DeleteMapping("/delDeviceExaminePlanDetail")
public Result delDeviceExaminePlanDetail(Integer planDetailsId){
- return Result.success(deviceExaminePlanDetailsService.removeById(planDetailsId));
+ return Result.success(deviceExaminePlanService.removeExaminePlanDetail(planDetailsId));
+ }
+
+ /**
+ * 涓烘寚瀹氳澶囨壘涓�鏉″彲褰曞叆鏍告煡璁板綍鐨勮鍒掓槑缁嗭紝娌℃湁鍒欐柊澧炴湰杞槑缁�
+ * @return
+ */
+ @Operation(summary = "鎸夎澶囪幏鍙栨湰杞牳鏌ヨ鍒掓槑缁�")
+ @GetMapping("/resolveExaminePlanDetail")
+ public Result<DeviceExaminePlanDetails> resolveExaminePlanDetail(Integer deviceId, String checkTime){
+ return Result.success(deviceExaminePlanService.resolveExaminePlanDetail(deviceId, checkTime));
}
/**
--
Gitblit v1.9.3