From 1f15333b0a97a327865f7aab8f1e3f9ba8fc16f8 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期五, 18 十月 2024 12:45:59 +0800 Subject: [PATCH] 电路站点报告调试+总报告ing --- inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java | 41 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 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 afee9e9..ab0a329 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,15 +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.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,10 +25,43 @@ */ 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<SampleProductDto> selectSampleProductListByOrder2Id2(Integer id); + + List<SampleProductDto3> selectSampleProductListByOrderId3(List<Integer> ids); + + List<SampleProductDto> getInsOrderAndSample(Integer id, String laboratory); + List<SampleProductDto> getInsOrderAndSample2(Integer id, String laboratory); + + String getSampleEn(String sample); + + List<InsProduct> getInsProduct1(@Param("id") Integer id, @Param("laboratory") String laboratory); + List<InsProduct> getIns2Product1(@Param("id") Integer id, @Param("laboratory") String laboratory); + List<InsProduct> get2InsProduct1(@Param("id") Integer id, @Param("laboratory") String laboratory, @Param("num") Integer num); + + 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); + + List<Map<String, String>> selectSampleList(Integer orderId); + + //杩囨护鎺夋病鏈夋楠岄」鐩殑鏍峰搧 + List<InsSample> selectSampleListByOrderId(Integer orderId); + + List<InsSample> selectInsSample(@Param("ids") List<Integer> ids); + + //鏌ヨ涓旇繃婊ゅ嚭鏈夌數璺瘯楠岀殑鏍峰搧 + List<InsSample> selectSample(Integer insOrderId); + + List<SampleProductDto> selectList1(Integer id); } -- Gitblit v1.9.3