From 2f467298075f6eb3bc40ecfa6da88c009f7fd0f8 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 10 四月 2025 13:32:14 +0800
Subject: [PATCH] 成品复测功能修改
---
cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java | 18 ++++++++++++++++--
1 files changed, 16 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..00e6914 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,19 @@
* @param response
*/
void exportEquipmentDetails(HttpServletResponse response);
+
+ /**
+ * 瀵煎叆璁惧
+ * @param list
+ * @return
+ */
+ void importExcel(List<Device> list);
+
+ /**
+ * 鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ暟閲�
+ * @param managementNumber
+ * @param request
+ * @return
+ */
+ Result<?> determineWhetherToCollectData(String managementNumber, HttpServletRequest request);
}
--
Gitblit v1.9.3