From fd58eac9c45b19300135d84b1d22013466807a96 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期日, 20 九月 2026 13:52:51 +0800
Subject: [PATCH] feat(inspect): 完善检验报告功能与数据处理 - 添加重新生成报告的功能接口 - 优化管理员权限判断逻辑，允许管理员查看全部待复核任务 - 改进Excel数据解析逻辑，支持合并单元格的坐标计算 - 完善直绑模板订单的检验结果处理机制 - 优化报告下载接口，支持按报告类型选择 - 提升附件上传大小限制至200MB
---
inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java
index 1caa282..5c438a0 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java
@@ -5,6 +5,9 @@
import com.ruoyi.inspect.dto.InsOrderPlanDTO;
import com.ruoyi.inspect.dto.InsOrderPlanProductDto;
import com.ruoyi.inspect.dto.SaveInsContextDto;
+import com.ruoyi.inspect.dto.SaveOrderDevicesDto;
+import com.ruoyi.inspect.dto.SaveTemplateContextDto;
+import com.ruoyi.inspect.dto.VerifyPlanDto;
import com.ruoyi.inspect.pojo.InsOrderFactoryVerify;
import com.ruoyi.inspect.pojo.InsOrderFile;
import com.ruoyi.inspect.pojo.InsProduct;
@@ -28,15 +31,21 @@
void saveInsContext(SaveInsContextDto saveInsContextDto);
+ void saveTemplateContext(SaveTemplateContextDto saveTemplateContextDto);
+
+ List<Integer> getOrderDeviceIds(Integer orderId);
+
+ void saveOrderDevices(SaveOrderDevicesDto saveOrderDevicesDto);
+
Map<String, Object> doInsOrder(Integer id, String laboratory);
int upPlanUser(Integer userId, Integer orderId,String sonLaboratory);
- int submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode);
+ int submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode, Boolean registerInsResults);
List<InsProduct> getInsProduct(InsOrderPlanProductDto insOrderPlanProductDto);
- List<String> checkSubmitPlan(Integer orderId, String laboratory);
+ Map<String,Object> checkSubmitPlan(Integer orderId, String laboratory);
IPage<InsOrderFile> getFileList(Page page, InsOrderFile insOrderFile);
@@ -47,6 +56,13 @@
int rawMaterialVerifyPlan(Integer orderId, String laboratory, Integer type, String tell, Integer userId);
+ int rawMaterialVerifyPlan(VerifyPlanDto verifyPlanDto);
+
+ /**
+ * 鎸夊綋鍓嶆楠屾暟鎹噸鏂扮敓鎴愬皻鏈壒鍑嗙殑绯荤粺鎶ュ憡銆�
+ */
+ void regenerateReport(Integer reportId, Integer createOrderUser);
+
/**
* 鐢电紗閰嶇疆. 鏌ョ湅鏍囪瘑
* @param id
--
Gitblit v1.9.3