From c21cb3d8cebd9cdef4df2efa372c5b9257c713e4 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期三, 28 十月 2026 17:57:40 +0800
Subject: [PATCH] feat(device,supply,satisfaction): 设备计划后端改造、耗材存放位置与满意度照片支持
---
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceExaminePlanController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 53 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 208271a..70641b7 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;
/**
@@ -139,6 +141,16 @@
}
/**
+ * 鏍告煡璁″垝骞翠唤鍒楄〃锛堣嚜鍔ㄥ垹闄ゆ病鏈夋槑缁嗙殑绌哄勾浠借鍒掞級
+ * @return
+ */
+ @Operation(summary = "鏍告煡璁″垝骞翠唤鍒楄〃")
+ @GetMapping("/getPlanYears")
+ public Result<List<String>> getPlanYears() {
+ return Result.success(deviceExaminePlanService.getExaminePlanYears());
+ }
+
+ /**
* 璁惧鏍告煡璁″垝璇︽儏鍒楄〃
* @return
*/
@@ -172,7 +184,7 @@
}
/**
- * 鍒犻櫎璁惧鏍告煡璁″垝璇︽儏锛堝凡鏈夋牳鏌ヨ褰曠殑涓嶅厑璁稿垹闄わ級
+ * 鍒犻櫎璁惧鏍告煡璁″垝璇︽儏锛堝凡瀹℃牳瀹屾垚鐨勬牳鏌ヨ褰曚笉鍏佽鍒犻櫎锛屾湭瀹℃牳璁板綍闅忔槑缁嗕竴璧峰垹闄わ級
* @return
*/
@Operation(summary = "鍒犻櫎璁惧鏍告煡璁″垝璇︽儏")
@@ -192,14 +204,52 @@
}
/**
+ * 鏌ユ壘鎸囧畾璁惧鍙鐢ㄧ殑璁″垝鏄庣粏锛堝彧鏌ヨ锛屼笉鏂板锛�
+ * @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));
+ }
+
+ /**
* 瀵煎嚭璁惧鏍告煡璁″垝
* @param planId 璁惧鏍告煡璁″垝id
* @return
*/
@Operation(summary = "瀵煎嚭璁惧鏍告煡璁″垝")
@GetMapping("/exportDeviceExaminePlanDetail")
- public void exportDeviceExaminePlanDetail(Integer planId, HttpServletResponse response){
- deviceExaminePlanService.exportDeviceExaminePlanDetail(planId, response);
+ public void exportDeviceExaminePlanDetail(Integer planId, String deviceName, String deviceNumber, HttpServletResponse response){
+ deviceExaminePlanService.exportDeviceExaminePlanDetail(planId, deviceName, deviceNumber, response);
}
/*********************************************** 鎶ュ憡 **************************************************/
--
Gitblit v1.9.3