From bcc80a6833abe9f24abdb978f7c7f01b664a574f Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期二, 18 二月 2025 14:48:45 +0800 Subject: [PATCH] 优化调整 --- inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java index 8e9a497..174116f 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.yuanchu.mom.dto.*; import com.yuanchu.mom.pojo.InsOrder; +import com.yuanchu.mom.pojo.InsSample; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.ServletException; import javax.servlet.http.HttpServletResponse; @@ -22,16 +24,15 @@ //鑾峰彇鍗曚綅妫�楠屼笅鍗曟暟鎹� Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto); - //淇敼妫�楠屼笅鍗曟暟鎹� - int upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId,String sonLaboratory); - - int addInsOrder(List<SampleProductDto> list, InsOrder insOrder, List<List<Integer>> pairing); + int addInsOrder(List<SampleProductDto> list, InsOrder insOrder, List<List<Integer>> pairing, List<MultipartFile> files); Map<String, Object> getInsOrder(Integer id); int upInsOrderOfState(InsOrder insOrder); - Map<String, Object> getInsOrderAndSample(Integer id, String laboratory); + int upInsOrderOfState2(InsOrder insOrder); + + Map<String, Object> getInsOrderAndSample(Integer sampleId, String laboratory); Map<String, Object> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, SampleProductDto2 sampleProductDto); @@ -45,5 +46,9 @@ List<SampleProductDto3> labelPrinting(String ids); + Map<String, List<InsSample>> checkNumber(String ids); + void export(CostStatisticsDto costStatisticsDto,HttpServletResponse response)throws IOException, ServletException; + + int addNumber(List<InsSample> insSamples); } -- Gitblit v1.9.3