From 7374d150b7f08d4b126d3d0fde57ab55febb53dd Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 05 三月 2025 09:48:24 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev_cr
---
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceStateController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceStateController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceStateController.java
index 4c73996..1d2ff28 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceStateController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceStateController.java
@@ -63,9 +63,9 @@
return Result.success(deviceStateService.removeById(stateId));
}
- @PostMapping("/deviceStateExport")
+ @GetMapping("/deviceStateExport")
public Result deviceStateExport(@RequestParam("deviceId") Integer deviceId, String processNumber, HttpServletResponse response) throws Exception {
- IPage<DeviceStateDto> deviceBorrows = deviceStateService.getDeviceStatePage(deviceId, new Page<>(1, -1), processNumber);
+ IPage<DeviceStateDto> deviceBorrows = deviceStateService.getDeviceStatePage(deviceId, new Page<>(-1, -1), processNumber);
List<DeviceStateExport> studentList = JSONObject.parseArray(JSON.toJSONString(deviceBorrows.getRecords()), DeviceStateExport.class);
response.setHeader("requestType", "excel");
response.setHeader("Access-Control-Expose-Headers", "requestType");
--
Gitblit v1.9.3