From d554630cee36c2eecd8dd293bd9f3b280bf1bc67 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 07 四月 2025 11:32:31 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwCollectRecordController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 ca6e9fb..ff08e86 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
@@ -46,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));
}
@@ -58,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));
}
@@ -70,8 +70,8 @@
* @param dto
* @return
*/
- @PostMapping("/edit")
@ApiOperation("编辑")
+ @PostMapping("/edit")
public R<?> edit(@Valid @RequestBody MwCollectRecordDTO dto) {
collectRecordService.edit(dto);
return R.ok();
@@ -83,10 +83,10 @@
* @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);
+ collectRecordService.delete(id);
return R.ok();
}
@@ -96,8 +96,8 @@
* @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));
}
@@ -108,8 +108,8 @@
* @param query
* @param response
*/
- @PostMapping("/export")
@ApiOperation("导出")
+ @PostMapping("/export")
public void export(@RequestBody MwCollectRecordQuery query, HttpServletResponse response) {
try {
collectRecordService.export(query, response);
--
Gitblit v1.7.1