From cfdaaae8690e188f6971057259873aa408ebc9e3 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 25 四月 2024 16:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
index b524e28..4e1cbe6 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
@@ -1,7 +1,15 @@
package com.yuanchu.mom.mapper;
-import com.yuanchu.mom.pojo.InsSample;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.dto.InsOrderPlanDTO;
+import com.yuanchu.mom.dto.SampleProductDto;
+import com.yuanchu.mom.pojo.InsSample;
+import com.yuanchu.mom.vo.InsOrderPlanVO;
+
+import java.util.List;
/**
* @author Administrator
@@ -11,6 +19,11 @@
*/
public interface InsSampleMapper extends BaseMapper<InsSample> {
+ IPage<InsOrderPlanVO> findInsSampleAndOrder(Page page, QueryWrapper<InsOrderPlanDTO> ew, Integer userId);
+
+ List<SampleProductDto> selectSampleProductListByOrderId(Integer id);
+
+ List<SampleProductDto> getInsOrderAndSample(Integer id, String laboratory);
}
--
Gitblit v1.9.3