From 7a9de16c90c1d936c35d426c95c3f4a9bba8a1f8 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期五, 22 十一月 2024 09:25:54 +0800 Subject: [PATCH] 电路试验的计算规则,将检验值转换成绝对值进行判定,不判定的情况加上要求值是中文 --- inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 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 ee1cdc3..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 @@ -32,26 +32,36 @@ 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(Integer id, String laboratory); - - List<InsProduct> getInsProduct2(Integer id); - - List<InsProduct> getInsProduct3(Integer id); - - List<InsProduct> getInsProduct4(Integer id); + 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