From 7bae2c55ff2d9c94d30df77ad2dfbc66bb703209 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期五, 06 九月 2024 17:40:33 +0800 Subject: [PATCH] 电路试验 --- inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 21 +++++++++++++++++---- 1 files changed, 17 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..600e748 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,13 @@ 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.InsProduct; +import com.yuanchu.mom.vo.InsProductResultVo; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; @@ -20,17 +22,21 @@ boolean claimInsOrderPlan(InsOrderPlanDTO entity); + //鏅�氱殑淇濆瓨妫�楠屽唴瀹� void saveInsContext(Map<String, Object> insContext); + + //鐢佃矾璇曢獙鐨勪繚瀛樻楠屽唴瀹� + 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 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 +46,11 @@ Map<String,Object> getReportModel(Integer sampleId); + Map<String,Object> temCycle(Integer sampleId, String inspectionItem, String inspectionItemSubclass); + + List<String> upPlanUser2(Integer orderId); + + int deleteInsContext(InsProductResultVo insProductResultVo); + + int deleteInsContext2(String frequency, Integer productId, String often); } -- Gitblit v1.9.3