From c0fd46ed9c7ddf7a3ea4e6a972474e9a62c68a1a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 22 七月 2024 19:59:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductMapper.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductMapper.java
index 6dfaf0e..2fe546e 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductMapper.java
@@ -1,7 +1,12 @@
package com.yuanchu.mom.mapper;
+import com.yuanchu.mom.dto.ProductResultDto2;
import com.yuanchu.mom.pojo.InsProduct;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
/**
* @author Administrator
@@ -11,8 +16,15 @@
*/
public interface InsProductMapper extends BaseMapper<InsProduct> {
- int selectOrderManDay(Integer sampleId);
+ int selectOrderManDay(Integer orderId);
+ Map<String, String> selectUserById(Integer userId);
+
+ List<ProductResultDto2> getProductAndResult(Integer sampleId);
+
+ int updateInspected(@Param("id") Integer id);
+
+ List<InsProduct> selectFiberInsProduct(List<Integer> ids, String laboratory);
}
--
Gitblit v1.9.3