From fbd4ecb70baf2e671876ca809a81f6e6fe7342ee Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期日, 20 九月 2026 19:52:50 +0800
Subject: [PATCH] feat(inspect): 新增检测标准方法报告文本功能并优化报告生成 - 委托编号生成逻辑调整为下单时生成并校验唯一性，避免审核时重复 - 新增标准模板价格字段及对应的数据模型和数据库映射 - 订单费用详情查询逻辑重构为基于模板价格计算方式 - 新增标准模板与设备绑定关系的数据结构和管理功能 - 委托编号唯一性校验逻辑增强
---
inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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 b2b200d..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
@@ -4,6 +4,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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;
@@ -25,17 +29,23 @@
boolean claimInsOrderPlan(InsOrderPlanDTO entity);
- void saveInsContext(Map<String, Object> insContext,Integer currentTable,Integer sampleId,Integer orderId,String sonLaboratory);
+ 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);
@@ -46,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