From 9733594dd881627b4c00665e6f9bfbf08c1cacec Mon Sep 17 00:00:00 2001 From: zhuo <2089219845@qq.com> Date: 星期一, 17 二月 2025 17:49:29 +0800 Subject: [PATCH] 业务管理移植 --- inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java index 07dd05d..ea5ac0a 100644 --- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java +++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java @@ -3,9 +3,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.basic.pojo.StandardProductList; import com.ruoyi.inspect.pojo.InsOrder; import com.ruoyi.inspect.pojo.InsUnqualifiedRetestProduct; import com.ruoyi.inspect.dto.*; +import com.ruoyi.inspect.vo.InsOrderPrintingVo; import javax.servlet.ServletException; import javax.servlet.http.HttpServletResponse; @@ -21,7 +23,7 @@ public interface InsOrderService extends IService<InsOrder> { //鑾峰彇鍗曚綅妫�楠屼笅鍗曟暟鎹� - Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto); + IPage<SampleOrderDto> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto); //淇敼妫�楠屼笅鍗曟暟鎹� @@ -35,9 +37,9 @@ Map<String, Object> getInsOrderAndSample(Integer id, String laboratory); - Map<String, Object> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, SampleProductDto2 sampleProductDto); + IPage<SampleProductDto2> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, SampleProductDto2 sampleProductDto); - Map<String, Object> costStatistics(IPage<CostStatisticsDto> page, CostStatisticsDto costStatisticsDto); + IPage<CostStatisticsDto> costStatistics(IPage<CostStatisticsDto> page, CostStatisticsDto costStatisticsDto); Map<String, Object> costStatistics2(CostStatisticsDto costStatisticsDto); -- Gitblit v1.9.3