From c428cfbdb79fdbb6b61ff10db62426d567e664a8 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 17 七月 2024 16:37:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 623ecc0..4167ff4 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
@@ -9,6 +9,7 @@
import com.yuanchu.mom.dto.SampleProductDto2;
import com.yuanchu.mom.pojo.InsOrder;
import com.yuanchu.mom.vo.SampleDefectsFatherVo;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@@ -34,16 +35,20 @@
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);
+}
\ No newline at end of file
--
Gitblit v1.9.3