From 704e7207d74b6477c5f472c5aba92d484ab17f98 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 29 十一月 2023 17:07:11 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
index b728a00..59cbc6f 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
@@ -66,23 +66,19 @@
}
@DeleteMapping("/delete/{id}")
- @ApiOperation("淇敼")
+ @ApiOperation("鍒犻櫎")
@LogSave(operationType = "鍗″彛绠＄悊", contain = "鍒犻櫎鍗″彛")
public CommonResult delete(@PathVariable Integer id) {
return CommonResult.success(iEquipmentBayonetService.removeById(id));
}
- @GetMapping("/export")
+
+ @PostMapping("/export")
@ApiOperation("瀵煎嚭")
@SneakyThrows
@LogSave(operationType = "鍗″彛绠＄悊", contain = "瀵煎嚭鍗″彛")
public void export(HttpServletResponse response,
- @RequestParam(required = false) Integer size,
- @RequestParam(required = false) Integer current,
@RequestParam(required = false) String bayonetName) {
- Page<EquipmentBayonet> equipmentBayonetPage = new Page<>();
- equipmentBayonetPage.setCurrent(current);
- equipmentBayonetPage.setSize(size);
- EasyExcelUtils.export(response, "鏁版嵁", EquipmentBayonetVO.class, iEquipmentBayonetService.selectEquipmentPage(equipmentBayonetPage, bayonetName).getRecords());
+ EasyExcelUtils.export(response, "鏁版嵁", EquipmentBayonetVO.class, iEquipmentBayonetService.selectEquipmentList(bayonetName));
}
}
\ No newline at end of file
--
Gitblit v1.8.0