From 23875dab418476d3b01bbd784a161c9f2b6b6ea1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 19 九月 2024 16:25:12 +0800
Subject: [PATCH] 编号规则变更
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 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 cacd4cc..9c750eb 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,15 @@
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.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;
@@ -20,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);
+ 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);
+ 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);
@@ -38,7 +47,12 @@
int uploadFile(Integer orderId, MultipartFile file);
- Map<String,Object> getReportModel(Integer sampleId);
+ List<String> upPlanUser2(Integer orderId);
- Map<String,Object> temCycle(Integer sampleId, String inspectionItem, String inspectionItemSubclass);
+ int deleteInsContext(InsProductResultVo insProductResultVo);
+
+ //鎵爜鎶ユ
+ int scanInsOrderState(String sonLaboratory, String sampleCode);
+
+ List<InsOrderUser> getInsOrderUserList(Integer insOrderStateId);
}
--
Gitblit v1.9.3