From 31ccc9cd47f96cea6e4e13b078187fd3201c4666 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 04 九月 2026 16:35:24 +0800
Subject: [PATCH] feat(report): 更新检测报告模板并优化报告生成功能 - 优化设备信息展示格式，支持多设备列表显示 - 统一检测报告和检验报告使用新版模板格式
---
cnas-require/src/main/java/com/ruoyi/require/controller/InternalWastesController.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/InternalWastesController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/InternalWastesController.java
index e507069..735e72b 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/InternalWastesController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/InternalWastesController.java
@@ -20,7 +20,7 @@
* 瀹夊叏鍐呭姟涓夊簾鐧昏 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-19 06:39:27
*/
@Api(tags = "瀹夊叏鍐呭姟涓夊簾鐧昏")
@@ -33,14 +33,13 @@
/**
* 瀹夊叏鍐呭姟涓夊簾澶勭悊鍒嗛〉鏌ヨ
- * @param data
+ * @param page
+ * @param internalWastes
* @return
*/
@ApiOperation(value = "瀹夊叏鍐呭姟涓夊簾澶勭悊鍒嗛〉鏌ヨ")
- @PostMapping("/pageInternalWastes")
- public Result<IPage<InternalWastesDto>> pageInternalWastes(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- InternalWastes internalWastes = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InternalWastes.class);
+ @GetMapping("/pageInternalWastes")
+ public Result<IPage<InternalWastesDto>> pageInternalWastes(Page page,InternalWastes internalWastes) throws Exception {
return Result.success(internalWastesService.pageInternalWastes(page, internalWastes));
}
@@ -69,7 +68,7 @@
* @return
*/
@ApiOperation(value = "瀹夊叏鍐呭姟涓夊簾澶勭悊鍒犻櫎")
- @GetMapping("/delInternalWastes")
+ @DeleteMapping("/delInternalWastes")
public Result delInternalWastes(Integer wastesId){
return Result.success(internalWastesService.delInternalWastes(wastesId));
}
--
Gitblit v1.9.3