From 58c18ed858c0c3eaaa95b6abceceb1f1ad320fcd Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期二, 04 六月 2024 21:21:44 +0800 Subject: [PATCH] 部分功能小调整 --- inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 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 720b72f..54dc7ce 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 @@ -5,11 +5,11 @@ 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.SampleOrderDto; import com.yuanchu.mom.dto.SampleProductDto; +import com.yuanchu.mom.pojo.InsProduct; import com.yuanchu.mom.pojo.InsSample; +import com.yuanchu.mom.vo.InsOrderPlanTaskSwitchVo; import com.yuanchu.mom.vo.InsOrderPlanVO; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -23,8 +23,21 @@ IPage<InsOrderPlanVO> findInsSampleAndOrder(Page page, QueryWrapper<InsOrderPlanDTO> ew, Integer userId); + IPage<InsOrderPlanTaskSwitchVo> inspectionOrderDetailsTaskSwitching(Page page, QueryWrapper<InsOrderPlanDTO> ew, Integer userId); + List<SampleProductDto> selectSampleProductListByOrderId(Integer id); + List<SampleProductDto> selectSampleProductListByOrderId2(Integer id); + + List<SampleProductDto> getInsOrderAndSample(Integer id, String laboratory); + + String getSampleEn(String sample); + + List<InsProduct> getInsProduct1(Integer id, String laboratory); + + List<InsProduct> getInsProduct2(Integer id); + + List<InsProduct> getInsProduct3(Integer id); } -- Gitblit v1.9.3