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/InsOrderMapper.java |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
index e2dd124..6f930c5 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
@@ -24,25 +24,33 @@
 public interface InsOrderMapper extends BaseMapper<InsOrder> {
 
     //鑾峰彇妫�楠屼笅鍗曟暟鎹�
-    IPage<SampleOrderDto> selectInsOrderPage(IPage<InsOrder> page, QueryWrapper<SampleOrderDto> ew);
+    IPage<SampleOrderDto> selectInsOrderPage(IPage<InsOrder> page,  QueryWrapper<SampleOrderDto> ew,  String laboratory);
 
     //淇敼妫�楠屼笅鍗曟暟鎹�
     int upInsOrderParameter(InsOrder itemParameter);
 
     String getLaboratoryCode(String name);
 
-    IPage<SampleProductDto2> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, QueryWrapper<SampleProductDto2> ew);
+    IPage<SampleProductDto2> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, QueryWrapper<SampleProductDto2> ew,Integer id);
 
     IPage<CostStatisticsDto> selectCostStatistics(IPage<CostStatisticsDto> page, QueryWrapper<CostStatisticsDto> ew);
 
-    List<Map<String, String>> selectDeviceList(Set<String> names);
-    List<SampleDefectsFatherVo> selectSampleDefects(Page page, String inspectionItems, String orderNumber);
+    List<CostStatisticsDto> selectCostStatistics2(@Param("ew") QueryWrapper<CostStatisticsDto> ew);
 
-    Long getCount(String inspectionItems, String orderNumber);
+    List<Map<String, String>> selectDeviceList(Set<String> names);
+    List<SampleDefectsFatherVo> selectSampleDefects(Page page, @Param("inspectionItems") String inspectionItems, @Param("orderNumber") String orderNumber);
+
+    Long getCount(@Param("inspectionItems") String inspectionItems, @Param("orderNumber") String orderNumber);
 
     String getEnumLabelByValue(String value);
 
-    String getStandardMethodCode(Integer id);
-
     int updateStatus( Integer id);
+
+    String selLaboratoryCode(String laboratory);
+
+    List<Map<Integer, Object>> selectReportModelByOrderId(@Param("id") Integer id, @Param("laboratory") String laboratory);
+
+    String seldepLimsId(int depLimsId);
+
+    InsOrder selectById2(Integer id);
 }
\ No newline at end of file

--
Gitblit v1.9.3