From a00890e840b80a741f62eb6cb31b46f13be6202f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 24 十月 2024 16:46:45 +0800
Subject: [PATCH] 附件调试修改+辐射站点报告生成
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 18 ++++++++++++++----
1 files changed, 14 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 9c750eb..640c48b 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,9 +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;
@@ -36,7 +38,7 @@
int verifyPlan(Integer orderId, String laboratory, Integer type, String tell) throws IOException;
- int submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode, String note,String term);
+ 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);
@@ -45,14 +47,22 @@
Map<String,Object> getFileList(Page page, InsOrderFile insOrderFile);
- int uploadFile(Integer orderId, MultipartFile file);
+ int uploadFile(Integer orderId, MultipartFile file,String sonLaboratory);
List<String> upPlanUser2(Integer orderId);
int deleteInsContext(InsProductResultVo insProductResultVo);
- //鎵爜鎶ユ
- int scanInsOrderState(String sonLaboratory, String sampleCode);
+ //鎵爜鎶ユ(鍏ュ簱)
+ 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