From f6b439c8958e7e0520057404b7226c7507f5d1a1 Mon Sep 17 00:00:00 2001 From: 李林 <z1292839451@163.com> Date: 星期四, 11 四月 2024 18:01:23 +0800 Subject: [PATCH] 报告生成功能:支持数据填充,发现单元格合并bug,发现模板重复 --- inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java | 11 +++++++---- 1 files changed, 7 insertions(+), 4 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 5a96cec..4f1f80f 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 @@ -2,10 +2,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.yuanchu.mom.dto.InsOderDto; -import com.yuanchu.mom.dto.OrderThingDto; -import com.yuanchu.mom.dto.SampleOrderDto; -import com.yuanchu.mom.dto.SampleProductDto; +import com.yuanchu.mom.dto.*; import com.yuanchu.mom.pojo.InsOrder; import java.util.List; @@ -30,4 +27,10 @@ int upInsOrderOfState(InsOrder insOrder); + Map<String, Object> getInsOrderAndSample(Integer id, String laboratory); + + Map<String, Object> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, SampleProductDto2 sampleProductDto); + + Map<String, Object> costStatistics(IPage<CostStatisticsDto> page, CostStatisticsDto costStatisticsDto); + } -- Gitblit v1.9.3