From c88f52ed0cf4eceb12c1ad74aa019f8469cd38ab Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 20 八月 2024 18:10:01 +0800
Subject: [PATCH] 标准库新增导出功能+标准库中点击光纤大类(后端生成的id重复报错)
---
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java | 7 +------
1 files changed, 1 insertions(+), 6 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 8a5a003..e9eeb16 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
@@ -31,7 +31,7 @@
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);
@@ -53,9 +53,4 @@
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