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/mapper/InsSampleMapper.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java
index b074da0..0b1fb82 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java
@@ -34,22 +34,22 @@
IPage<InsOrderPlanTaskSwitchVo> inspectionOrderDetailsTaskSwitching(Page page, @Param("ew") QueryWrapper<InsOrderPlanDTO> ew, @Param("userId") Integer userId, @Param("sonLaboratory") String sonLaboratory, @Param("laboratory") String laboratory);
- List<SampleProductDto> selectSampleProductListByOrderId(Integer id);
+ List<SampleProductDto> selectSampleProductListByOrderId(@Param("id") Integer id);
- List<SampleProductDto> selectSampleProductListByOrderId2(Integer id);
+ List<SampleProductDto> selectSampleProductListByOrderId2(@Param("id") Integer id);
- Map<String,Object> selectInsOrder(Integer id);
+ Map<String,Object> selectInsOrder(@Param("id") Integer id);
- List<SampleProductDto> getInsOrderAndSample(Integer id, String laboratory);
+ List<SampleProductDto> getInsOrderAndSample(@Param("id") Integer id, @Param("laboratory") String laboratory);
- String getSampleEn(String sample);
+ String getSampleEn(@Param("sample") String sample);
/**
* 鍙兘娌℃湁浜у搧鐩存帴灏辨槸瀵硅薄
* @param sample
* @return
*/
- String getSampleEnByObject(String sample);
+ String getSampleEnByObject(@Param("sample") String sample);
/**
* 鏍峰搧
@@ -57,7 +57,7 @@
* @param laboratory
* @return
*/
- List<InsProduct> getInsProduct1(Integer id, String laboratory, String cableTag, String repetitionTag, String isDisqualification);
+ List<InsProduct> getInsProduct1(@Param("id") Integer id, @Param("laboratory") String laboratory, @Param("cableTag") String cableTag, @Param("repetitionTag") String repetitionTag);
/**
@@ -67,11 +67,11 @@
* @param rawMaterialTag
* @return
*/
- List<InsProduct> getInsProduct6(Integer id, String laboratory, String rawMaterialTag, String isDisqualification);
+ List<InsProduct> getInsProduct6(@Param("id") Integer id, @Param("laboratory") String laboratory, @Param("rawMaterialTag") String rawMaterialTag);
- SampleVo getDetailById(Integer sampleId);
+ SampleVo getDetailById(@Param("sampleId") Integer sampleId);
- String selMethodById(Integer sampleId);
+ String selMethodById(@Param("sampleId") Integer sampleId);
/**
* 鐢电紗閰嶇疆鏌ョ湅閰嶇疆鏍囪瘑
@@ -98,7 +98,7 @@
List<Map<String, Object>> getRepetitionTag(@Param("id") Integer id, @Param("laboratory") String laboratory, @Param("cableTag") String cableTag);
- List<SampleProductDto> selectExemptionByOrderId(Integer id);
+ List<SampleProductDto> selectExemptionByOrderId(@Param("id") Integer id);
/**
* 鏌ヨ鍘傚瀵嗗害(鏈夊瀷鍙�)
@@ -122,7 +122,14 @@
* @param itemIds
* @return
*/
- List<InsProduct> selectProductResult(List<Integer> itemIds);
+ List<InsProduct> selectProductResult(@Param("itemIds") List<Integer> itemIds);
+
+ /**
+ * 鏍规嵁璁㈠崟id鏌ヨ鏍峰搧
+ * @param insOrderId
+ * @return
+ */
+ List<InsSample> getSampleByOrderId(Integer insOrderId);
}
--
Gitblit v1.9.3