From e78cc56f04556a1d3d54f0db830ba9f16eb28a58 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 03 八月 2024 21:40:53 +0800
Subject: [PATCH] 检验下单待检撤销+删除检验值结论还在

---
 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 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..8a5a003 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,7 +24,7 @@
 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);
@@ -35,14 +35,27 @@
 
     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);
+
+    Map<String, Object> getDeviceMessage(@Param("ip")String ip,
+                                         @Param("inspectionItem") String inspectionItem,
+                                         @Param("inspectionItemSubclass") String inspectionItemSubclass,
+                                         @Param("sample") String sample);
 }
\ No newline at end of file

--
Gitblit v1.9.3