From 0e2e829f10a5e5b239d6583d6be3afbcaed0dcc0 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期三, 31 七月 2024 17:58:30 +0800 Subject: [PATCH] PK8000处理调试+各种bug调试优化 --- inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java | 26 +++++++++++++++++++++++++- 1 files changed, 25 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 88d97ae..7576790 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 @@ -6,10 +6,16 @@ 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.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 @@ -19,13 +25,31 @@ */ public interface InsSampleMapper extends BaseMapper<InsSample> { - IPage<InsOrderPlanVO> findInsSampleAndOrder(Page page, QueryWrapper<InsOrderPlanDTO> ew, Integer userId); + IPage<InsOrderPlanVO> findInsSampleAndOrder(Page page, QueryWrapper<InsOrderPlanDTO> ew, Integer userId,String sonLaboratory); + + IPage<InsOrderPlanTaskSwitchVo> inspectionOrderDetailsTaskSwitching(Page page, QueryWrapper<InsOrderPlanDTO> ew, Integer userId,String sonLaboratory); 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<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