From 9f19d3a24f8474bf6f9eb9401888c44b34b381e6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 十一月 2024 14:29:50 +0800
Subject: [PATCH] 第一次改动(检验任务与样品关联,附件与样品关联,报告与样品关联)
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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 8402719..9eecab7 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
@@ -3,8 +3,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.InsProductResultDto;
+import com.yuanchu.mom.dto.SubmitPlanDto;
import com.yuanchu.mom.pojo.InsOrderFile;
+import com.yuanchu.mom.pojo.InsOrderUser;
import com.yuanchu.mom.pojo.InsProduct;
+import com.yuanchu.mom.pojo.InsProductResult;
import com.yuanchu.mom.vo.InsProductResultVo;
import org.springframework.web.multipart.MultipartFile;
@@ -29,25 +32,37 @@
//鐢佃矾璇曢獙鐨勪繚瀛樻楠屽唴瀹�
List<Integer> saveInsContext2(InsProductResultDto insProductResultDtos);
- Map<String, Object> doInsOrder(Integer id, String laboratory);
+ Map<String, Object> doInsOrder(Integer sampleId, String laboratory);
- int upPlanUser(Integer userId, Integer orderId,String sonLaboratory);
+ int upPlanUser(Integer userId, Integer sampleId,String sonLaboratory);
- int verifyPlan(Integer orderId, String laboratory, Integer type, String tell) throws IOException;
+ int verifyPlan(Integer sampleId, String laboratory, Integer type, String tell) throws IOException;
- int submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode);
+ int submitPlan(SubmitPlanDto submitPlanDto);
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);
+ List<String> checkSubmitPlan(Integer sampleId, String laboratory);
Map<String,Object> getFileList(Page page, InsOrderFile insOrderFile);
- int uploadFile(Integer orderId, MultipartFile file);
+ int uploadFile(Integer orderId, MultipartFile file,String sonLaboratory,Integer sampleId);
- List<String> upPlanUser2(Integer orderId);
+ List<String> upPlanUser2(Integer sampleId);
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;
+
+ int saveInsContext3(InsProductResult insProductResult);
}
--
Gitblit v1.9.3