From c2ff8c71c67eb76ef23ad21acb53401ea978c282 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 23 七月 2024 17:24:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 8d2d2ef..6539a54 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,11 +2,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
-import com.yuanchu.mom.dto.InsProductDto;
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;
@@ -24,13 +24,13 @@
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);
+ int submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode, String sampleCode);
- List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory);
+ List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory, HttpServletRequest request);
List<String> checkSubmitPlan(Integer orderId, String laboratory);
@@ -40,4 +40,5 @@
Map<String,Object> getReportModel(Integer sampleId);
+ Map<String,Object> temCycle(Integer sampleId, String inspectionItem, String inspectionItemSubclass);
}
--
Gitblit v1.9.3