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/service/DeviceExaminePlanService.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceExaminePlanService.java b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceExaminePlanService.java
index aa4c52d..555152d 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceExaminePlanService.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceExaminePlanService.java
@@ -70,11 +70,13 @@
 
 
     /**
-     * 瀵煎嚭璁惧鏍告煡璁″垝
+     * 瀵煎嚭璁惧鏍告煡璁″垝锛圗xcel锛�
      * @param deviceExaminePlanId 璁惧鏍告煡璁″垝id
+     * @param deviceName 璁惧鍚嶇О绛涢�夛紙涓虹┖鏃跺鍑鸿骞翠唤鍏ㄩ儴锛�
+     * @param deviceNumber 璁惧缂栧彿绛涢�夛紙涓虹┖鏃跺鍑鸿骞翠唤鍏ㄩ儴锛�
      * @param response 鍝嶅簲
      */
-    void exportDeviceExaminePlanDetail(Integer deviceExaminePlanId, HttpServletResponse response);
+    void exportDeviceExaminePlanDetail(Integer deviceExaminePlanId, String deviceName, String deviceNumber, HttpServletResponse response);
 
     /**
      * 鎵归噺淇敼璁惧鏍告煡璁″垝
@@ -98,6 +100,12 @@
     DeviceExaminePlanDto getOrCreatePlanByYear(String planYear);
 
     /**
+     * 鏍告煡璁″垝骞翠唤鍒楄〃锛氬垹闄ゆ病鏈変换浣曟槑缁嗙殑绌哄勾浠借鍒掑悗锛岃繑鍥炴湁鏄庣粏鐨勫勾浠斤紙鍊掑簭锛�
+     * @return 骞翠唤鍒楄〃
+     */
+    List<String> getExaminePlanYears();
+
+    /**
      * 璁惧妗f鍙樻洿鍚庯紝绔嬪嵆鎶婅澶囩櫥璁板埌涓嬫鏍告煡鏃ユ湡鎵�鍦ㄥ勾浠界殑璁惧鏍告煡璁″垝鏄庣粏
      * @param device 璁惧
      */

--
Gitblit v1.9.3