From bcc80a6833abe9f24abdb978f7c7f01b664a574f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 18 二月 2025 14:48:45 +0800
Subject: [PATCH] 优化调整
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 10 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..20e5f5e 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,18 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
-import com.yuanchu.mom.dto.InsProductDto;
+import com.yuanchu.mom.dto.InsProductResultDto;
+import com.yuanchu.mom.dto.InsProductResultDtos;
+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;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -20,24 +27,53 @@
boolean claimInsOrderPlan(InsOrderPlanDTO entity);
- void saveInsContext(Map<String, Object> insContext);
+ //鏅�氱殑淇濆瓨妫�楠屽唴瀹�
+ void saveInsContext(Map<String, Object> insContext,Integer num);
- Map<String, Object> doInsOrder(Integer id, String laboratory);
+ //鐢佃矾璇曢獙鐨勪繚瀛樻楠屽唴瀹�
+ List<Integer> saveInsContext2(InsProductResultDto insProductResultDtos);
- int upPlanUser(Integer userId, Integer orderId);
+ Map<String, Object> doInsOrder(Integer sampleId, String laboratory);
- int verifyPlan(Integer orderId, String laboratory, Integer type, String tell);
+ int upPlanUser(Integer userId, Integer sampleId,String sonLaboratory);
- int submitPlan(Integer orderId, String laboratory, Integer verifyUser);
+ int verifyPlan(Integer sampleId, String laboratory, Integer type, String tell) throws IOException;
- List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory);
+ //绾犳澶嶆牳閿欒鐨勬儏鍐�
+ int verifyPlan2(Integer sampleId, String laboratory, Integer type, String tell) throws IOException;
- List<String> checkSubmitPlan(Integer orderId, String laboratory);
+ int submitPlan(SubmitPlanDto submitPlanDto);
+
+ //鎾ら攢鎻愪氦
+ int cancelSubmitPlan(Integer orderStateId);
+
+ 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 sampleId, String laboratory);
Map<String,Object> getFileList(Page page, InsOrderFile insOrderFile);
- int uploadFile(Integer orderId, MultipartFile file);
+ Object uploadFile(Integer orderId, MultipartFile file,String sonLaboratory,Integer sampleId);
- Map<String,Object> getReportModel(Integer sampleId);
+ List<String> upPlanUser2(Integer sampleId);
+
+ int deleteInsContext(InsProductResultVo insProductResultVo);
+
+ //鎵爜鎶ユ(鍏ュ簱)
+ int scanInsOrderState(String sonLaboratory, String sampleCode,String trees,String entrustCode);
+
+ //鎵爜鍑哄簱
+ int outInsOrderState(String sonLaboratory, String sampleCode,String entrustCode);
+
+ List<InsOrderUser> getInsOrderUserList(Integer insOrderStateId);
+
+ //棰勮鏂囦欢
+ Object preview(Integer id) throws Exception;
+
+ int saveInsContext3(InsProductResult insProductResult);
+
+ int saveInsContext2s(InsProductResultDtos insProductResultDtos);
+
}
--
Gitblit v1.9.3