From e72766e5c5cceae416c0fa17ef075a01cd3fd396 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 13 八月 2025 09:34:34 +0800
Subject: [PATCH] 检验任务筛选增加人员字段+检验和复核支持样品编号的修改
---
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index 4754723..959a9a5 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -20,6 +20,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -59,10 +60,10 @@
@ValueClassify("璁惧")
@ApiOperation(value = "鏌ヨ璁惧璇︽儏鍒楄〃")
@PostMapping("/selectDeviceParameter")
- public Result selectDeviceParameter(@RequestBody Map<String, Object> data) throws Exception {
+ public Result selectDeviceParameter(@RequestBody Map<String, Object> data,@RequestParam(value = "laboratoryNameIsNull", required = false) Boolean laboratoryNameIsNull) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
DeviceDto itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), DeviceDto.class);
- return Result.success(deviceService.selectDeviceParameter(page, itemParameter));
+ return Result.success(deviceService.selectDeviceParameter(page, itemParameter,laboratoryNameIsNull));
}
@ValueClassify("璁惧")
@@ -150,10 +151,10 @@
}
@ApiOperation(value = "閫氳繃璁惧缂栧彿鑾峰彇璁惧鍒楄〃")
- @PostMapping("/selectDeviceByCode")
+ @GetMapping("/selectDeviceByCode")
@ValueAuth
- public Result selectDeviceByCode(String code) {
- return Result.success(deviceService.selectDeviceByCode(code));
+ public Result selectDeviceByCode(Integer id) {
+ return Result.success(deviceService.selectDeviceByCode(id));
}
@ValueAuth
@@ -216,4 +217,18 @@
return Result.success(deviceService.treeDevice(deviceName));
}
-}
\ No newline at end of file
+ @ApiOperation(value = "璁惧妗ｆ瀵煎嚭")
+ @GetMapping("/exportDeviceFile")
+ @ValueAuth
+ public void exportDeviceFile(@RequestParam Integer deviceId, HttpServletResponse response) throws Exception {
+ deviceService.exportDeviceFile(deviceId,response);
+ }
+
+ @ApiOperation(value = "浠櫒璁惧涓�瑙堣〃瀵煎嚭")
+ @GetMapping("/exportEquipmentDetails")
+ @ValueAuth
+ public void exportEquipmentDetails(HttpServletResponse response) throws Exception {
+ deviceService.exportEquipmentDetails(response);
+ }
+
+}
--
Gitblit v1.9.3