From 31ccc9cd47f96cea6e4e13b078187fd3201c4666 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 04 九月 2026 16:35:24 +0800
Subject: [PATCH] feat(report): 更新检测报告模板并优化报告生成功能 - 优化设备信息展示格式，支持多设备列表显示 - 统一检测报告和检验报告使用新版模板格式
---
cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java
index b732701..a7c4845 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java
@@ -8,6 +8,7 @@
import com.ruoyi.device.dto.DeviceCollectionDto;
import com.ruoyi.device.dto.DeviceDto;
import com.ruoyi.device.pojo.Device;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -34,8 +35,6 @@
List<Device> search(Integer status, String deviceName, String specificationModel, String largeCategory);
- List<Device> selectDevicePrincipal();
-
List<Device> selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass,String laboratory);
DeviceDto selectDeviceByCode(Integer id);
@@ -56,4 +55,8 @@
* @param response
*/
void exportEquipmentDetails(HttpServletResponse response);
+
+ void downloadImportTemplate(HttpServletResponse response);
+
+ int importDevice(MultipartFile file);
}
--
Gitblit v1.9.3