From e07e8d4ccd220af0cb6d51cde68bff6434a6e623 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期四, 08 八月 2024 20:57:07 +0800 Subject: [PATCH] 光纤配置在光纤试验室显示 --- inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java | 4 +++- 1 files changed, 3 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 9eb4e61..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 @@ -25,7 +25,7 @@ */ public interface InsSampleMapper extends BaseMapper<InsSample> { - IPage<InsOrderPlanVO> findInsSampleAndOrder(Page page, @Param("ew") QueryWrapper<InsOrderPlanDTO> ew, @Param("userId") Integer userId, @Param("sonLaboratory") String sonLaboratory, @Param("laboratory") String laboratory); + 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); @@ -45,6 +45,8 @@ 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); -- Gitblit v1.9.3