From 2dc478231fd09a88a4d86d44388ae807aca08bc5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 10:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwCollectRecordController.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwCollectRecordController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwCollectRecordController.java
index 48555e4..daf8a0a 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwCollectRecordController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwCollectRecordController.java
@@ -20,7 +20,9 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.io.IOException;
/**
* <p>
@@ -44,8 +46,8 @@
* @param query
* @return
*/
- @PostMapping("/page")
@ApiOperation("医废追溯分页列表")
+ @PostMapping("/page")
public R<PageDTO<MwCollectRecordVO>> pageList(@Valid @RequestBody MwCollectRecordQuery query) {
return R.ok(collectRecordService.pageList(query));
}
@@ -56,8 +58,8 @@
* @param id
* @return
*/
- @GetMapping("/detail/{id}")
@ApiOperation("医废追溯详情")
+ @GetMapping("/detail/{id}")
public R<MwCollectRecordVO> detail(@ApiParam(name = "id", value = "医废追溯id", required = true) @PathVariable("id") Long id) {
return R.ok(collectRecordService.detail(id));
}
@@ -68,8 +70,8 @@
* @param dto
* @return
*/
- @PostMapping("/edit")
@ApiOperation("编辑")
+ @PostMapping("/edit")
public R<?> edit(@Valid @RequestBody MwCollectRecordDTO dto) {
collectRecordService.edit(dto);
return R.ok();
@@ -81,8 +83,8 @@
* @param id
* @return
*/
- @DeleteMapping("/{id}")
@ApiOperation("删除")
+ @DeleteMapping("/{id}")
public R<?> remove(@ApiParam(name = "id", value = "医废追溯id", required = true) @PathVariable("id") Long id) {
collectRecordService.removeById(id);
return R.ok();
@@ -94,9 +96,25 @@
* @param id
* @return
*/
- @GetMapping("/process/{id}")
@ApiOperation("流转过程")
+ @GetMapping("/process/{id}")
public R<MedicalWasteProcessVO> getProcess(@ApiParam(name = "id", value = "医废追溯id", required = true) @PathVariable("id") Long id) {
return R.ok(collectRecordService.getProcess(id));
}
+
+ /**
+ * 导出
+ *
+ * @param query
+ * @param response
+ */
+ @ApiOperation("导出")
+ @PostMapping("/export")
+ public void export(@RequestBody MwCollectRecordQuery query, HttpServletResponse response) {
+ try {
+ collectRecordService.export(query, response);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
}
--
Gitblit v1.7.1