From b22f118eabab8f2f27dbd73e7c6cb1090cd82c82 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 27 三月 2025 14:46:00 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwCheckoutRecordController.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwCheckoutRecordController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwCheckoutRecordController.java
index 287e309..6dbcff8 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwCheckoutRecordController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwCheckoutRecordController.java
@@ -5,6 +5,7 @@
import com.sinata.system.domain.query.CheckoutRecordQuery;
import com.sinata.system.domain.query.MwCheckoutRecordItemQuery;
import com.sinata.system.domain.query.MwTransitRecordQuery;
+import com.sinata.system.domain.query.TransitRecordQuery;
import com.sinata.system.domain.vo.MwCheckoutRecordVO;
import com.sinata.system.domain.vo.MwMedicalWasteBoxVO;
import com.sinata.system.domain.vo.MwTransitRecordVO;
@@ -47,8 +48,8 @@
* @param query
* @return
*/
- @PostMapping("/hospital/page")
@ApiOperation(value = "转运记录分页列表")
+ @PostMapping("/hospital/page")
public R<PageDTO<MwCheckoutRecordVO>> pageList(@Valid @RequestBody CheckoutRecordQuery query) {
return R.ok(mwCheckoutRecordService.pageHospitalTransitList(query));
}
@@ -59,8 +60,8 @@
* @param query
* @param response
*/
- @PostMapping("/hospital/export")
@ApiOperation("转运记录导出")
+ @PostMapping("/hospital/export")
public void checkoutRecordExport(@RequestBody CheckoutRecordQuery query, HttpServletResponse response) {
try {
mwCheckoutRecordService.checkoutRecordExport(query, response);
@@ -71,13 +72,13 @@
/**
* 转运记录详情
*
- * @param departmentId
+ * @param id
* @return
*/
- @GetMapping("/hospital/detail/{departmentId}")
@ApiOperation(value = "转运记录详情")
- public R<MwCheckoutRecordVO> hospitalDetail(@ApiParam(name = "id", value = "医院id", required = true) @PathVariable("departmentId") Long departmentId) {
- return R.ok(mwCheckoutRecordService.hospitalDetail(departmentId));
+ @GetMapping("/hospital/detail/{id}")
+ public R<MwCheckoutRecordVO> hospitalDetail(@ApiParam(name = "id", value = "医院id", required = true) @PathVariable("id") Long id) {
+ return R.ok(mwCheckoutRecordService.hospitalDetail(id));
}
/**
@@ -86,8 +87,8 @@
* @param query
* @return
*/
- @PostMapping("/hospital/detailPage")
@ApiOperation(value = "转运记录医废详情分页列表")
+ @PostMapping("/hospital/detailPage")
public R<PageDTO<MwMedicalWasteBoxVO>> hospitalDetailPage(@Valid @RequestBody MwCheckoutRecordItemQuery query) {
return R.ok(mwCheckoutRecordService.hospitalDetailPage(query));
}
@@ -98,8 +99,8 @@
* @param query
* @return
*/
- @PostMapping("/transit/page")
@ApiOperation(value = "运输记录分页列表")
+ @PostMapping("/transit/page")
public R<PageDTO<MwTransitRecordVO>> transitPageList(@Valid @RequestBody MwTransitRecordQuery query) {
return R.ok(mwCheckoutRecordService.transitPageList(query));
}
@@ -107,13 +108,13 @@
/**
* 运输记录详情
*
- * @param id
+ * @param query
* @return
*/
- @GetMapping("/transit/detail/{id}")
@ApiOperation("运输记录详情")
- public R<MwTransitRecordVO> transitDetail(@ApiParam(name = "id", value = "运输记录id", required = true) @PathVariable("id") Long id) {
- return R.ok(mwCheckoutRecordService.transitDetail(id));
+ @PostMapping("/transit/detail")
+ public R<MwTransitRecordVO> transitDetail(@RequestBody TransitRecordQuery query) {
+ return R.ok(mwCheckoutRecordService.transitDetail(query));
}
/**
@@ -122,9 +123,9 @@
* @param query
* @return
*/
- @PostMapping("/transit/detailPage")
@ApiOperation("运输记录详情分页列表")
- public R<PageDTO<MwMedicalWasteBoxVO>> transitDetailPage(@Valid @RequestBody MwTransitRecordQuery query) {
+ @PostMapping("/transit/detailPage")
+ public R<PageDTO<MwMedicalWasteBoxVO>> transitDetailPage(@Valid @RequestBody TransitRecordQuery query) {
return R.ok(mwCheckoutRecordService.transitDetailPageList(query));
}
}
--
Gitblit v1.7.1