From 883d4f4d7e07196afeb2cbc33b41f805e58198e6 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 06 五月 2025 09:06:00 +0800
Subject: [PATCH] 修改检验项问题修复
---
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductMapper.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductMapper.java
index 52a8ef0..d3e7fe3 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductMapper.java
@@ -3,9 +3,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.inspect.dto.InsProductAnalysisDto;
import com.ruoyi.inspect.dto.ProductResultDto2;
import com.ruoyi.inspect.dto.SampleProductRawAnalysisDto;
import com.ruoyi.inspect.pojo.InsProduct;
+import com.ruoyi.inspect.pojo.InsProductDeviationWarningDetail;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -19,19 +21,19 @@
*/
public interface InsProductMapper extends BaseMapper<InsProduct> {
- int selectOrderManDay(Integer orderId);
+ int selectOrderManDay(@Param("orderId") Integer orderId);
- Map<String, String> selectUserById(Integer userId);
+ Map<String, String> selectUserById(@Param("userId") Integer userId);
- List<ProductResultDto2> getProductAndResult(Integer sampleId);
+ List<ProductResultDto2> getProductAndResult(@Param("sampleId") Integer sampleId);
int updateInspected(@Param("id") Integer id);
- List<InsProduct> selectFiberInsProduct(List<Integer> ids, String laboratory);
+ List<InsProduct> selectFiberInsProduct(@Param("ids") List<Integer> ids, @Param("laboratory") String laboratory);
- IPage<InsProduct> selectNoProducts(Page page, Integer orderId, List<Integer> noIds);
+ IPage<InsProduct> selectNoProducts(@Param("page") Page page, @Param("orderId") Integer orderId, @Param("noIds") List<Integer> noIds);
- int selectInsProductCountByOrderId(Integer orderId);
+ int selectInsProductCountByOrderId(@Param("orderId") Integer orderId);
/**
* 鏍规嵁鏍峰搧id鏌ヨ妫�楠岄」鐩�
@@ -52,14 +54,29 @@
* @param orderId
* @return
*/
- List<String> selectUnqualifiedList(Integer orderId);
+ List<String> selectUnqualifiedList(@Param("orderId") Integer orderId);
/**
* 鏌ヨ鍒ゆ柇鏄惁鏈変笉鍒ゅ畾椤圭洰,鍜屽叏閮芥槸鍒ゅ畾椤�
* @param orderId
* @return
*/
- int selectNoJudge(Integer orderId);
+ int selectNoJudge(@Param("orderId") Integer orderId);
+
+ /**
+ * 鏍规嵁璁㈠崟鏌ヨ浜у搧淇℃伅
+ * @param orderId
+ * @return
+ */
+ List<InsProduct> selectProductByOrderId(Integer orderId);
+
+ /**
+ * 鏌ヨ鍚屼竴鍨嬪彿, 鍚屼竴鍘傚, 鍚屼竴妫�娴嬮」鐨勬娴嬫暟鎹�
+ * @param insProduct
+ * @param supplierName
+ * @return
+ */
+ List<InsProductDeviationWarningDetail> selectAnalysis(@Param("insProduct") InsProduct insProduct, @Param("supplierName") String supplierName);
}
--
Gitblit v1.9.3