Merge remote-tracking branch 'origin/master'

value

2024-05-27 cdefd6a50721e2c4ba6df850e1405419f9df3c31

 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java

@@ -7,6 +7,7 @@
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 java.util.List;
@@ -21,6 +22,8 @@

    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> getInsOrderAndSample(Integer id, String laboratory);