From 7d5f9679128b3084c502b2bf6b076453a439cefc Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期二, 25 三月 2025 10:07:01 +0800 Subject: [PATCH] 检验任务时间筛选 --- inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 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 9eecab7..20e5f5e 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.dto.InsOrderPlanDTO; import com.yuanchu.mom.dto.InsProductResultDto; +import com.yuanchu.mom.dto.InsProductResultDtos; import com.yuanchu.mom.dto.SubmitPlanDto; import com.yuanchu.mom.pojo.InsOrderFile; import com.yuanchu.mom.pojo.InsOrderUser; @@ -38,7 +39,13 @@ int verifyPlan(Integer sampleId, String laboratory, Integer type, String tell) throws IOException; + //绾犳澶嶆牳閿欒鐨勬儏鍐� + int verifyPlan2(Integer sampleId, String laboratory, Integer type, String tell) throws IOException; + int submitPlan(SubmitPlanDto submitPlanDto); + + //鎾ら攢鎻愪氦 + int cancelSubmitPlan(Integer orderStateId); List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory, HttpServletRequest request); List<InsProduct> getInsProduct2(Integer id, Integer type, String laboratory, HttpServletRequest request,Integer num); @@ -47,17 +54,17 @@ Map<String,Object> getFileList(Page page, InsOrderFile insOrderFile); - int uploadFile(Integer orderId, MultipartFile file,String sonLaboratory,Integer sampleId); + Object 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 scanInsOrderState(String sonLaboratory, String sampleCode,String trees,String entrustCode); //鎵爜鍑哄簱 - int outInsOrderState(String sonLaboratory, String sampleCode); + int outInsOrderState(String sonLaboratory, String sampleCode,String entrustCode); List<InsOrderUser> getInsOrderUserList(Integer insOrderStateId); @@ -65,4 +72,8 @@ Object preview(Integer id) throws Exception; int saveInsContext3(InsProductResult insProductResult); + + int saveInsContext2s(InsProductResultDtos insProductResultDtos); + + } -- Gitblit v1.9.3