From d2afa808c6b182fe5867a7df8cde3b8668b25c1d Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期六, 08 六月 2024 17:38:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 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 0d79f69..d5f7bc6 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,19 +1,40 @@
package com.yuanchu.mom.service;
-import com.yuanchu.mom.dto.OrderThingDto;
-import com.yuanchu.mom.pojo.InsOrder;
+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.*;
+import com.yuanchu.mom.pojo.InsOrder;
import java.util.List;
import java.util.Map;
/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恑ns_order(妫�楠屼笅鍗�)銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2024-03-08 09:44:13
-*/
+ * @author gaoaoy
+ * @description 閽堝琛ㄣ�恑ns_order(妫�楠屼笅鍗�)銆戠殑鏁版嵁搴撴搷浣淪ervice
+ * @createDate 2024-03-12 16:17:55
+ */
public interface InsOrderService extends IService<InsOrder> {
- List<OrderThingDto> getOrderThing();
+ //鑾峰彇妫�楠屼笅鍗曟暟鎹�
+ Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto);
+ //淇敼妫�楠屼笅鍗曟暟鎹�
+ int upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId);
+
+ int addInsOrder(List<SampleProductDto> list, InsOrder insOrder, List<List<Integer>> pairing);
+
+ 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);
+
+ int updateStatus(Integer id);
}
--
Gitblit v1.9.3