From 9687fd99fdf6208dbf747ea45c440f192a9af815 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 14 三月 2025 17:43:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev
---
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductMapper.java | 23 +++++++++++++++--------
1 files changed, 15 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..66334f8 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
@@ -19,19 +19,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 +52,21 @@
* @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);
}
--
Gitblit v1.9.3