From 4aaca7f7a2e5f57d829c4ea0f641abee7648707b Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期五, 09 八月 2024 11:40:44 +0800 Subject: [PATCH] 检验任务保存优化 --- inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 11 +++++++---- 1 files changed, 7 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 8d2d2ef..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 @@ -2,11 +2,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.dto.InsOrderPlanDTO; -import com.yuanchu.mom.dto.InsProductDto; import com.yuanchu.mom.pojo.InsOrderFile; 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; @@ -24,13 +24,13 @@ 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 submitPlan(Integer orderId, String laboratory, Integer verifyUser); + 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 +40,7 @@ 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