From bcbdb084c3a3a0a4de8fca1aa16caf0bc4681ddf Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期二, 27 十月 2026 09:41:51 +0800
Subject: [PATCH] feat(device): 删除核查计划明细时连带清理未审核记录和附件，已审核记录仍禁止删除
---
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceExaminePlanController.java | 66 +++++++++++++++++++++++++++++++-
1 files changed, 63 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 deeeb1c..1dfc6f0 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
@@ -7,6 +7,7 @@
import com.ruoyi.device.dto.DeviceExaminePlanDto;
import com.ruoyi.device.dto.DeviceExamineRecordContrastDto;
import com.ruoyi.device.dto.DeviceExamineRecordDto;
+import com.ruoyi.device.pojo.DeviceExamineAttachment;
import com.ruoyi.device.pojo.DeviceExaminePlan;
import com.ruoyi.device.pojo.DeviceExaminePlanDetails;
import com.ruoyi.device.service.DeviceExaminePlanDetailsService;
@@ -21,6 +22,7 @@
import org.springframework.web.multipart.MultipartFile;
import jakarta.servlet.http.HttpServletResponse;
+import java.util.List;
import java.util.Map;
/**
@@ -129,6 +131,16 @@
}
/**
+ * 鎸夊勾浠芥煡璇㈣澶囨牳鏌ヨ鍒掞紙涓嶅瓨鍦ㄥ垯鑷姩鍒涘缓锛夛紝骞惰嚜鍔ㄨˉ鍏ㄥ凡鍒扮偣鐨勮澶囨槑缁�
+ * @return
+ */
+ @Operation(summary = "鎸夊勾浠芥煡璇㈣澶囨牳鏌ヨ鍒掞紙鑷姩鍒涘缓骞惰ˉ鍏ㄥ埌鐐规槑缁嗭級")
+ @GetMapping("/getPlanByYear")
+ public Result<DeviceExaminePlanDto> getPlanByYear(String planYear) {
+ return Result.success(deviceExaminePlanService.getOrCreatePlanByYear(planYear));
+ }
+
+ /**
* 璁惧鏍告煡璁″垝璇︽儏鍒楄〃
* @return
*/
@@ -158,17 +170,65 @@
@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));
+ }
+
+ /**
+ * 鏌ユ壘鎸囧畾璁惧鍙鐢ㄧ殑璁″垝鏄庣粏锛堝彧鏌ヨ锛屼笉鏂板锛�
+ * @return
+ */
+ @Operation(summary = "鏌ユ壘鍙鐢ㄧ殑鏍告煡璁″垝鏄庣粏")
+ @GetMapping("/findExaminePlanDetail")
+ public Result<DeviceExaminePlanDetails> findExaminePlanDetail(Integer deviceId, String checkTime){
+ return Result.success(deviceExaminePlanService.findExaminePlanDetail(deviceId, checkTime));
+ }
+
+ /**
+ * 鏌ヨ鏍告煡璁板綍闄勪欢
+ */
+ @Operation(summary = "鏌ヨ鏍告煡璁板綍闄勪欢")
+ @GetMapping("/selectAttachments")
+ public Result<List<DeviceExamineAttachment>> selectAttachments(Integer planDetailsId) {
+ return Result.success(deviceExaminePlanService.selectAttachments(planDetailsId));
+ }
+
+ /**
+ * 涓婁紶鏍告煡璁板綍闄勪欢锛堜换鎰忔牸寮忥紝鏀寔澶氫釜锛�
+ */
+ @Operation(summary = "涓婁紶鏍告煡璁板綍闄勪欢")
+ @PostMapping("/uploadAttachment")
+ public Result uploadAttachment(@RequestParam("planDetailsId") Integer planDetailsId,
+ @RequestParam("file") MultipartFile file) {
+ return Result.success(deviceExaminePlanService.uploadAttachment(planDetailsId, file));
+ }
+
+ /**
+ * 鍒犻櫎鏍告煡璁板綍闄勪欢
+ */
+ @Operation(summary = "鍒犻櫎鏍告煡璁板綍闄勪欢")
+ @DeleteMapping("/deleteAttachment")
+ public Result deleteAttachment(Long id) {
+ return Result.success(deviceExaminePlanService.deleteAttachment(id));
}
/**
--
Gitblit v1.9.3