From d2afa808c6b182fe5867a7df8cde3b8668b25c1d Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期六, 08 六月 2024 17:38:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java
index acee2fb..4ec5f67 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java
@@ -2,9 +2,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
-import com.yuanchu.mom.pojo.InsOrder;
-import com.yuanchu.mom.pojo.InsSample;
+import com.yuanchu.mom.pojo.InsOrderFile;
+import com.yuanchu.mom.pojo.InsProduct;
+import org.springframework.web.multipart.MultipartFile;
+import java.util.List;
import java.util.Map;
/**
@@ -13,7 +15,11 @@
public interface InsOrderPlanService {
Map<String,Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO);
+ Map<String,Object> inspectionOrderDetailsTaskSwitching(Page page, InsOrderPlanDTO insOrderPlanDTO);
+
boolean claimInsOrderPlan(InsOrderPlanDTO entity);
+
+ void saveInsContext(Map<String, Object> insContext);
Map<String, Object> doInsOrder(Integer id, String laboratory);
@@ -21,5 +27,13 @@
int verifyPlan(Integer orderId, String laboratory, Integer type, String tell);
- int submitPlan(Integer orderId, String laboratory);
+ int submitPlan(Integer orderId, String laboratory, Integer verifyUser);
+
+ List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory);
+
+ List<String> checkSubmitPlan(Integer orderId, String laboratory);
+
+ Map<String,Object> getFileList(Page page, InsOrderFile insOrderFile);
+
+ int uploadFile(Integer orderId, MultipartFile file);
}
--
Gitblit v1.9.3