From c296b7d0c412429d29ad24bd34aa9def65045085 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 10 四月 2025 17:17:09 +0800
Subject: [PATCH] 成品下单检验新增字段
---
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 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..5782ef2 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.inspect.dto.InsOrderPlanDTO;
+import com.ruoyi.inspect.dto.InsOrderPlanQueryDto;
import com.ruoyi.inspect.dto.SampleProductDto;
import com.ruoyi.inspect.pojo.InsProduct;
import com.ruoyi.inspect.pojo.InsSample;
@@ -26,30 +27,26 @@
IPage<InsOrderPlanVO> findInsSampleAndOrder(Page page,
@Param("ew") QueryWrapper<InsOrderPlanDTO> ew,
- @Param("userName") String userName ,
- @Param("userId") Integer userId,
- @Param("sonLaboratory") String sonLaboratory,
- @Param("laboratory") String laboratory,
- @Param("isCheck") Integer isCheck);
+ @Param("otherParam")InsOrderPlanQueryDto otherParam);
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 +54,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, @Param("isDisqualification") String isDisqualification);
/**
@@ -67,11 +64,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, @Param("isDisqualification") String isDisqualification);
- SampleVo getDetailById(Integer sampleId);
+ SampleVo getDetailById(@Param("sampleId") Integer sampleId);
- String selMethodById(Integer sampleId);
+ String selMethodById(@Param("sampleId") Integer sampleId);
/**
* 鐢电紗閰嶇疆鏌ョ湅閰嶇疆鏍囪瘑
@@ -98,7 +95,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 +119,7 @@
* @param itemIds
* @return
*/
- List<InsProduct> selectProductResult(List<Integer> itemIds);
+ List<InsProduct> selectProductResult(@Param("itemIds") List<Integer> itemIds);
}
--
Gitblit v1.9.3