From c28d3bb363dde2afb44c168b93379b2bf6b1f67f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 07 九月 2023 15:26:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/InspectionItemService.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 ecf667f..58c06ff 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
@@ -1,7 +1,7 @@
package com.yuanchu.mom.service;
-import com.yuanchu.mom.pojo.InspectionItem;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.mom.pojo.InspectionItem;
import com.yuanchu.mom.pojo.dto.InspectionItemDto;
import com.yuanchu.mom.pojo.dto.UpdateInspectionItemDto;
@@ -18,11 +18,28 @@
*/
public interface InspectionItemService extends IService<InspectionItem> {
- void insertList(Integer finishInspectId, List<Map<String, Object>> list);
- List<InspectionItemDto> selectInspectionItem(Integer finishInspectId);
+ /**
+ * 鏂板鎸夐挳-->2銆佹煡璇㈡墍鏈夋楠岄」鐩�
+ * @param finishInspectId
+ * @return
+ */
+ List<InspectionItemDto> selectInspectionItem(Integer finishInspectId, Integer type);
+ /**
+ * 鏂板鎸夐挳-->2銆佹楠岄」鐩�-->澶卞幓鐒︾偣鍙戣捣璇ヨ姹�
+ * @param username
+ * @param updateInspectionItemDto
+ * @return
+ */
Integer addProcessInspectionSheet(String username, UpdateInspectionItemDto updateInspectionItemDto);
- List<Map<String, Object>> selectDeviceIdAndName();
+ /**
+ * 鏂板鎸夐挳-->閫夋嫨璁惧
+ * @param technologyId
+ * @param father
+ * @param name
+ * @return
+ */
+ List<Map<String, Object>> chooseDev(Integer technologyId, String father, String name);
}
--
Gitblit v1.9.3