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): 更新检测报告模板并优化报告生成功能 - 优化设备信息展示格式，支持多设备列表显示 - 统一检测报告和检验报告使用新版模板格式
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
index 8cbb1d9..814ba70 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
@@ -99,15 +99,15 @@
@ApiOperation(value = "鏍￠獙妫�楠屼换鍔℃彁浜�")
@PostMapping("/checkSubmitPlan")
- public Result<?> checkSubmitPlan(Integer orderId, String laboratory) {
- return Result.success(insOrderPlanService.checkSubmitPlan(orderId, laboratory));
+ public Result<?> checkSubmitPlan(Integer orderId, String laboratory, Integer reportType) {
+ return Result.success(insOrderPlanService.checkSubmitPlan(orderId, laboratory, reportType));
}
- @ApiOperation(value = "妫�楠屼换鍔℃彁浜�")
+ @ApiOperation(value = "妫�楠屼换鍔℃彁浜わ紙reportType锛�0妫�娴嬫姤鍛婏紝1妫�楠屾姤鍛婏級")
@PostMapping("/submitPlan")
- public Result<?> submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode,Boolean registerInsResults) {
- int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode,registerInsResults);
+ public Result<?> submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode, Boolean registerInsResults, Integer reportType) {
+ int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode, registerInsResults, reportType);
return num == 1 ? Result.success() : Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
}
--
Gitblit v1.9.3