From fe9a623b42b02e7fcd112f6a85d55b3beeb58d2e Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期四, 27 三月 2025 17:51:45 +0800
Subject: [PATCH] bug
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwCheckoutRecordController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 7 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 278ca04..7de027c 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;
@@ -21,7 +22,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>
@@ -45,22 +48,37 @@
* @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));
}
/**
+ * 转运记录导出
+ *
+ * @param query
+ * @param response
+ */
+ @ApiOperation("转运记录导出")
+ @PostMapping("/hospital/export")
+ public void checkoutRecordExport(@RequestBody CheckoutRecordQuery query, HttpServletResponse response) {
+ try {
+ mwCheckoutRecordService.checkoutRecordExport(query, response);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ /**
* 转运记录详情
*
- * @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));
}
/**
@@ -69,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));
}
@@ -81,9 +99,33 @@
* @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));
}
+
+ /**
+ * 运输记录详情
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation("运输记录详情")
+ @PostMapping("/transit/detail")
+ public R<MwTransitRecordVO> transitDetail(@RequestBody TransitRecordQuery query) {
+ return R.ok(mwCheckoutRecordService.transitDetail(query));
+ }
+
+ /**
+ * 运输记录详情分页列表
+ *
+ * @param query
+ * @return
+ */
+ @ApiOperation("运输记录详情分页列表")
+ @PostMapping("/transit/detailPage")
+ public R<PageDTO<MwMedicalWasteBoxVO>> transitDetailPage(@Valid @RequestBody TransitRecordQuery query) {
+ return R.ok(mwCheckoutRecordService.transitDetailPageList(query));
+ }
}
--
Gitblit v1.7.1