From c88f52ed0cf4eceb12c1ad74aa019f8469cd38ab Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期二, 20 八月 2024 18:10:01 +0800 Subject: [PATCH] 标准库新增导出功能+标准库中点击光纤大类(后端生成的id重复报错) --- inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 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 510fa39..88c2c4a 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 @@ -6,6 +6,7 @@ import com.yuanchu.mom.pojo.InsProduct; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; @@ -27,9 +28,9 @@ int verifyPlan(Integer orderId, String laboratory, Integer type, String tell); - int submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode, String sampleCode); + int submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode); - List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory); + List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory, HttpServletRequest request); List<String> checkSubmitPlan(Integer orderId, String laboratory); @@ -40,4 +41,6 @@ Map<String,Object> getReportModel(Integer sampleId); Map<String,Object> temCycle(Integer sampleId, String inspectionItem, String inspectionItemSubclass); + + List<String> upPlanUser2(Integer orderId); } -- Gitblit v1.9.3