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/MwMicroEquipmentRecordController.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwMicroEquipmentRecordController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwMicroEquipmentRecordController.java
index 130d2a0..a9f684a 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwMicroEquipmentRecordController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwMicroEquipmentRecordController.java
@@ -5,14 +5,17 @@
import com.sinata.system.domain.dto.MwMicroEquipmentRecordDTO;
import com.sinata.system.domain.query.MwMicroEquipmentRecordQuery;
import com.sinata.system.domain.query.MwMicroEquipmentStaticsQuery;
+import com.sinata.system.domain.vo.DepartmentReportVO;
import com.sinata.system.domain.vo.MwMicroEquipmentRecordVO;
import com.sinata.system.domain.vo.MwMicroEquipmentStaticsTitleVO;
import com.sinata.system.service.MwMicroEquipmentRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,7 +34,7 @@
* @author mitao
* @since 2024-12-02
*/
-@Api(tags = {"设备使用记录相关接口"})
+@Api(tags = {"小型微波设备使用记录相关接口"})
@Validated
@RequiredArgsConstructor
@RestController
@@ -51,6 +54,17 @@
return R.ok(mwMicroEquipmentRecordService.pageList(query));
}
+ /**
+ * 设备使用记录详情
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation("设备使用记录详情")
+ @GetMapping("/{id}")
+ public R<MwMicroEquipmentRecordVO> detail(@ApiParam(name = "id", value = "设备id", required = true) @PathVariable("id") Long id) {
+ return R.ok(mwMicroEquipmentRecordService.detail(id));
+ }
/**
* 导出设备使用记录
*
@@ -98,10 +112,9 @@
*/
@ApiOperation("处置分析数据")
@PostMapping("/statics/data")
- public R<List<List<String>>> staticsData(@Valid @RequestBody MwMicroEquipmentStaticsQuery query) {
+ public R<DepartmentReportVO> staticsData(@Valid @RequestBody MwMicroEquipmentStaticsQuery query) {
return R.ok(mwMicroEquipmentRecordService.getStaticsData(query));
}
-
/**
* 处置分析导出
*
@@ -110,7 +123,7 @@
*/
@ApiOperation("处置分析导出")
@PostMapping("/statics/export")
- public void export(@Valid @RequestBody MwMicroEquipmentStaticsQuery query, HttpServletResponse response) {
+ public void export(@RequestBody MwMicroEquipmentStaticsQuery query, HttpServletResponse response) {
try {
mwMicroEquipmentRecordService.staticsExport(query, response);
} catch (IOException e) {
--
Gitblit v1.7.1