From 82ce59218139d9fefeae7b9e5fbc88b499ff023f Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 08 十月 2026 13:35:06 +0800
Subject: [PATCH] feat(inspect): 新增新聚检验订单编辑功能并优化报告生成流程 - 新增 updateNewJuInsOrder 接口支持新聚检验订单修改 - 增加文件上传大小限制至200MB，请求大小限制至400MB - 在设备信息中新增出厂编号字段显示 - 优化温湿度处理逻辑，报告中仅显示温度信息 - 新增印章管理功能，支持MA标志章、报告章和骑缝章配置 - 完善检验报告生成流程，增加多种报告类型常量定义 - 优化附件上传功能，增加空值检查和返回值处理 - 调整委托编号生成逻辑，完善新聚订单可编辑性判断 - 更新CNAS流程中报告编号使用正式报告编号替代委托编号
---
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java
index a657183..f3a7eef 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java
@@ -7,20 +7,21 @@
import com.ruoyi.process.service.ProcessReportService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* <p>
* 妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-05 08:58:39
*/
@RestController
@@ -32,8 +33,8 @@
private ProcessReportService processReportService;
@ApiOperation(value = "鏌ヨ妫�楠屾姤鍛婂彂鏀剧櫥璁板垪琛�")
- @PostMapping("/pageProcessReport")
- public Result pageProcessReport(ProcessReport processReport , Page page) throws Exception {
+ @GetMapping("/pageProcessReport")
+ public Result pageProcessReport(ProcessReportDto processReport , Page page) {
return Result.success(processReportService.pageProcessReport(page, processReport));
}
@@ -44,13 +45,13 @@
}
@ApiOperation(value = "鍒犻櫎妫�楠屾姤鍛婂彂鏀剧櫥璁�")
- @PostMapping("/delProcessReport")
+ @DeleteMapping("/delProcessReport")
public Result delProcessReport(Long id) {
return Result.success(processReportService.removeById(id));
}
@ApiOperation(value = "鏌ョ湅妫�楠屾姤鍛婂彂鏀剧櫥璁拌鎯�")
- @PostMapping("/getProcessReport")
+ @GetMapping("/getProcessReport")
public Result getProcessReport(Long id) {
return Result.success(processReportService.getById(id));
}
@@ -62,9 +63,15 @@
}
@ApiOperation(value = "瀵煎嚭妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃")
- @PostMapping("/exportProcessReport")
- public Result exportProcessReport(@RequestBody ProcessReportDto processReportDto) {
- return Result.success(processReportService.exportProcessReport(processReportDto.getIds()));
+ @GetMapping("/exportProcessReport")
+ public void exportProcessReport(ProcessReportDto dto, HttpServletResponse response) {
+ processReportService.exportProcessReport(dto, response);
+ }
+
+ @ApiOperation(value = "涓嬭浇鎵瑰噯鍚庣殑鏈夌珷鎶ュ憡")
+ @GetMapping("/downloadStampedReport")
+ public void downloadStampedReport(Integer id, String format, HttpServletResponse response) {
+ processReportService.downloadStampedReport(id, format, response);
}
}
--
Gitblit v1.9.3