From 1c683ded6a17523c47d7e1d853736562007d26bc Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期一, 03 六月 2024 09:07:34 +0800 Subject: [PATCH] 完成光纤配置进行检验操作 --- inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java | 12 ++++++++++-- 1 files changed, 10 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 afee9e9..62edb36 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,13 +1,14 @@ package com.yuanchu.mom.mapper; +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.InsOrderPlanTaskSwitchVo; import com.yuanchu.mom.vo.InsOrderPlanVO; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -19,10 +20,17 @@ */ public interface InsSampleMapper extends BaseMapper<InsSample> { - IPage<InsOrderPlanVO> findInsSampleAndOrder(Page page, @Param("ew") InsOrderPlanDTO insOrderPlanDTO); + 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); } -- Gitblit v1.9.3