From a968d22689475fc7ddea69ee408b290e810dd835 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期二, 06 八月 2024 19:08:46 +0800 Subject: [PATCH] 松套管修改 --- inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 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 997e607..ee1cdc3 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,21 @@ 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.dto.SampleProductDto3; +import com.yuanchu.mom.pojo.InsProduct; import com.yuanchu.mom.pojo.InsSample; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yuanchu.mom.vo.InsOrderPlanTaskSwitchVo; import com.yuanchu.mom.vo.InsOrderPlanVO; +import com.yuanchu.mom.vo.SampleVo; import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; /** * @author Administrator @@ -17,8 +25,33 @@ */ public interface InsSampleMapper extends BaseMapper<InsSample> { - IPage<InsOrderPlanVO> findInsSampleAndOrder(Page page, @Param("ew") InsOrderPlanDTO insOrderPlanDTO); + IPage<InsOrderPlanVO> findInsSampleAndOrder(Page page, @Param("ew") QueryWrapper<InsOrderPlanDTO> ew, @Param("userName") String userName, @Param("sonLaboratory") String sonLaboratory, @Param("laboratory") String laboratory); + IPage<InsOrderPlanTaskSwitchVo> inspectionOrderDetailsTaskSwitching(Page page, @Param("ew") QueryWrapper<InsOrderPlanDTO> ew, @Param("userId") Integer userId, @Param("sonLaboratory") String sonLaboratory, @Param("laboratory") String laboratory); + + List<SampleProductDto> selectSampleProductListByOrderId(Integer id); + + List<SampleProductDto> selectSampleProductListByOrderId2(Integer id); + + List<SampleProductDto3> selectSampleProductListByOrderId3(List<Integer> ids); + + 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); + + List<InsProduct> getInsProduct4(Integer id); + + List<Map<String, Object>> getReportModel(@Param("orderId") Integer orderId, @Param("id") Integer id, @Param("laboratory") String laboratory); + + SampleVo getDetailById(Integer sampleId); + + String selMethodById(Integer sampleId); } -- Gitblit v1.9.3