From d98ca6e960a7ea69fd4385fbd34887a4c86dc317 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 21 六月 2024 09:01:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java |   11 +++++------
 1 files changed, 5 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 623ecc0..27073cd 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;
@@ -35,15 +36,13 @@
     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<SampleDefectsFatherVo> selectSampleDefects(Page page, @Param("inspectionItems") String inspectionItems, @Param("orderNumber") String orderNumber);
 
-    Long getCount(String inspectionItems, String orderNumber);
+    Long getCount(@Param("inspectionItems") String inspectionItems, @Param("orderNumber") String orderNumber);
 
     String getEnumLabelByValue(String value);
 
     String getStandardMethodCode(Integer id);
-}
 
-
-
-
+    int updateStatus( Integer id);
+}
\ No newline at end of file

--
Gitblit v1.9.3