From 2bfebb31df25d8ddc0c5ccaff4bed91d87e1070b Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 24 七月 2024 17:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java | 20 ++++++++++++++++----
1 files changed, 16 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..a093759 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, @Param("ew") QueryWrapper<SampleOrderDto> ew, @Param("laboratory") String laboratory);
//淇敼妫�楠屼笅鍗曟暟鎹�
int upInsOrderParameter(InsOrder itemParameter);
@@ -35,14 +35,26 @@
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);
}
\ No newline at end of file
--
Gitblit v1.9.3