From e700e89f85e58747b57fc0d7e1fd30f3483aacca Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期六, 14 九月 2024 16:05:57 +0800 Subject: [PATCH] 检验任务历史记录 --- inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 36 +++++++++++++++++++++++++++++++----- 1 files changed, 31 insertions(+), 5 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 48957a1..9c750eb 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,8 +2,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.dto.InsOrderPlanDTO; +import com.yuanchu.mom.dto.InsProductResultDto; +import com.yuanchu.mom.pojo.InsOrderFile; +import com.yuanchu.mom.pojo.InsOrderUser; 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.io.IOException; import java.util.List; import java.util.Map; @@ -17,16 +24,35 @@ boolean claimInsOrderPlan(InsOrderPlanDTO entity); - void saveInsContext(Map<String, Object> insContext); + //鏅�氱殑淇濆瓨妫�楠屽唴瀹� + void saveInsContext(Map<String, Object> insContext,Integer num); + + //鐢佃矾璇曢獙鐨勪繚瀛樻楠屽唴瀹� + 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 verifyPlan(Integer orderId, String laboratory, Integer type, String tell) throws IOException; - int submitPlan(Integer orderId, String laboratory, Integer verifyUser); + int submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode, String note,String term); - List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory); + 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 orderId, String laboratory); + + Map<String,Object> getFileList(Page page, InsOrderFile insOrderFile); + + int uploadFile(Integer orderId, MultipartFile file); + + List<String> upPlanUser2(Integer orderId); + + int deleteInsContext(InsProductResultVo insProductResultVo); + + //鎵爜鎶ユ + int scanInsOrderState(String sonLaboratory, String sampleCode); + + List<InsOrderUser> getInsOrderUserList(Integer insOrderStateId); } -- Gitblit v1.9.3