From 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspect-server/src/main/java/com/yuanchu/mom/service/InspectionItemService.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InspectionItemService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InspectionItemService.java
index 58c06ff..5812158 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InspectionItemService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InspectionItemService.java
@@ -21,10 +21,10 @@
 
     /**
      * 鏂板鎸夐挳-->2銆佹煡璇㈡墍鏈夋楠岄」鐩�
-     * @param finishInspectId
+     * @param id
      * @return
      */
-    List<InspectionItemDto> selectInspectionItem(Integer finishInspectId, Integer type);
+    List<InspectionItemDto> selectInspectionItem(Integer id, Integer type);
 
     /**
      * 鏂板鎸夐挳-->2銆佹楠岄」鐩�-->澶卞幓鐒︾偣鍙戣捣璇ヨ姹�
@@ -41,5 +41,15 @@
      * @param name
      * @return
      */
-    List<Map<String, Object>> chooseDev(Integer technologyId, String father, String name);
+    //List<Map<String, Object>> chooseDev(Integer technologyId, String father, String name);
+
+
+    /**
+     * 鏇存敼璁惧
+     * @param id
+     * @param type
+     * @param devId
+     */
+    void updateDevByInsId(Integer id, Integer type, Integer devId);
+
 }

--
Gitblit v1.9.3