From 9f19d3a24f8474bf6f9eb9401888c44b34b381e6 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期四, 21 十一月 2024 14:29:50 +0800 Subject: [PATCH] 第一次改动(检验任务与样品关联,附件与样品关联,报告与样品关联) --- inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 48 insertions(+), 7 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 9c801a8..9eecab7 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,9 +2,18 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.dto.InsOrderPlanDTO; -import com.yuanchu.mom.pojo.InsOrder; -import com.yuanchu.mom.pojo.InsSample; +import com.yuanchu.mom.dto.InsProductResultDto; +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; /** @@ -13,15 +22,47 @@ public interface InsOrderPlanService { Map<String,Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO); + Map<String,Object> inspectionOrderDetailsTaskSwitching(Page page, InsOrderPlanDTO insOrderPlanDTO); + 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); + int verifyPlan(Integer sampleId, String laboratory, Integer type, String tell) throws IOException; + + int submitPlan(SubmitPlanDto submitPlanDto); + + 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,String sonLaboratory,Integer sampleId); + + List<String> upPlanUser2(Integer sampleId); + + int deleteInsContext(InsProductResultVo insProductResultVo); + + //鎵爜鎶ユ(鍏ュ簱) + int scanInsOrderState(String sonLaboratory, String sampleCode,String trees); + + //鎵爜鍑哄簱 + int outInsOrderState(String sonLaboratory, String sampleCode); + + List<InsOrderUser> getInsOrderUserList(Integer insOrderStateId); + + //棰勮鏂囦欢 + Object preview(Integer id) throws Exception; + + int saveInsContext3(InsProductResult insProductResult); } -- Gitblit v1.9.3