From 4eab53b44135f6381a7f2011ac17066412297f43 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 11 十月 2024 11:15:35 +0800
Subject: [PATCH] 电路试验的站点报告1.0
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 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 7b49e94..94e9cb8 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,10 +2,15 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
+import com.yuanchu.mom.dto.InsProductResultDto;
import com.yuanchu.mom.pojo.InsOrderFile;
+import com.yuanchu.mom.pojo.InsOrderUser;
import com.yuanchu.mom.pojo.InsProduct;
+import com.yuanchu.mom.vo.InsProductResultVo;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -19,17 +24,22 @@
boolean claimInsOrderPlan(InsOrderPlanDTO entity);
- void saveInsContext(Map<String, Object> insContext);
+ //鏅�氱殑淇濆瓨妫�楠屽唴瀹�
+ void saveInsContext(Map<String, Object> insContext,Integer num);
+
+ //鐢佃矾璇曢獙鐨勪繚瀛樻楠屽唴瀹�
+ List<Integer> saveInsContext2(InsProductResultDto insProductResultDtos);
Map<String, Object> doInsOrder(Integer id, String laboratory);
int upPlanUser(Integer userId, Integer orderId,String sonLaboratory);
- int verifyPlan(Integer orderId, String laboratory, Integer type, String tell);
+ int verifyPlan(Integer orderId, String laboratory, Integer type, String tell) throws IOException;
- int submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode, String sampleCode);
+ int submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode, String note,String term);
- List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory);
+ List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory, HttpServletRequest request);
+ List<InsProduct> getInsProduct2(Integer id, Integer type, String laboratory, HttpServletRequest request,Integer num);
List<String> checkSubmitPlan(Integer orderId, String laboratory);
@@ -37,9 +47,18 @@
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);
+
+ int deleteInsContext(InsProductResultVo insProductResultVo);
+
+ //鎵爜鎶ユ(鍏ュ簱)
+ int scanInsOrderState(String sonLaboratory, String sampleCode,String trees);
+
+ //鎵爜鍑哄簱
+ int outInsOrderState(String sonLaboratory, String sampleCode);
+
+ List<InsOrderUser> getInsOrderUserList(Integer insOrderStateId);
+
+ //棰勮鏂囦欢
+ Object preview(Integer id) throws Exception;
}
--
Gitblit v1.9.3