From 54bae7fcc7a2dca32b7614b698c52399b2920b4f Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期一, 24 三月 2025 13:35:47 +0800 Subject: [PATCH] 近场/远场辐射导入样式修改 --- inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 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 28d3c7e..4dd71b4 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 @@ -29,16 +29,15 @@ 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> selectSampleProductListByOrder2Id(Integer id); + 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); + SampleProductDto getInsOrderAndSample(Integer sampleId, String laboratory); + SampleProductDto getInsOrderAndSample2(Integer sampleId, String laboratory); String getSampleEn(String sample); @@ -53,6 +52,15 @@ 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); + } -- Gitblit v1.9.3