From 0d6aae2036feb77bb2796f6b484489d7ffcd99c2 Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期五, 10 五月 2024 22:19:25 +0800 Subject: [PATCH] 各bug修复 --- inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 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 937e818..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,8 +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.OrderThingDto; +import com.yuanchu.mom.dto.*; import com.yuanchu.mom.pojo.InsOrder; import java.util.List; @@ -15,18 +16,23 @@ */ public interface InsOrderService extends IService<InsOrder> { - List<OrderThingDto> getOrderThing(); - //鑾峰彇妫�楠屼笅鍗曟暟鎹� - Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, InsOrder itemParameter); - - //娣诲姞妫�楠屼笅鍗曟暟鎹� - int addInsOrderParameter(InsOrder itemParameter); - - //鍒犻櫎妫�楠屼笅鍗曟暟鎹� - int delInsOrderParameter(Integer id); + Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto); //淇敼妫�楠屼笅鍗曟暟鎹� - int upInsOrderParameter(InsOrder itemParameter); + int upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId); + 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