From ff4d45d57c3d1a1c8d4218dd83023cb7e4c34d7e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 26 七月 2024 12:45:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 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 a2450f0..ba0ffcd 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,12 @@
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 javax.servlet.http.HttpServletRequest;
+import java.util.List;
import java.util.Map;
/**
@@ -13,11 +16,31 @@
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);
- int upPlanUser(Integer userId, Integer orderId);
+ int upPlanUser(Integer userId, Integer orderId,String sonLaboratory);
int verifyPlan(Integer orderId, String laboratory, Integer type, String tell);
+
+ int submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode, String sampleCode);
+
+ List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory, HttpServletRequest request);
+
+ List<String> checkSubmitPlan(Integer orderId, String laboratory);
+
+ Map<String,Object> getFileList(Page page, InsOrderFile insOrderFile);
+
+ int uploadFile(Integer orderId, MultipartFile file);
+
+ Map<String,Object> getReportModel(Integer sampleId);
+
+ Map<String,Object> temCycle(Integer sampleId, String inspectionItem, String inspectionItemSubclass);
+
+ List<String> upPlanUser2(Integer orderId);
}
--
Gitblit v1.9.3