From bc7d9c98bc1b23ef6ef29ed4a6313753f6900640 Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期二, 14 五月 2024 02:25:01 +0800 Subject: [PATCH] 费用统计查询修复; 检验下单字段调整; 下单进度查询修改; 执行优化去掉多余模板内容; 报告生成删除试验方法; 修改报告表格列宽; 修改报告删除列的统计方法 --- inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java | 17 +++++++++++++---- 1 files changed, 13 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 8092635..ccb2eab 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 @@ -1,11 +1,9 @@ package com.yuanchu.mom.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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; @@ -26,4 +24,15 @@ int addInsOrder(List<SampleProductDto> list, InsOrder insOrder); + Map<String, Object> getInsOrder(Integer id); + + 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); + + Map<String, Object> selectSampleDefects(Page page, String inspectionItems, String orderNumber); } -- Gitblit v1.9.3