From 40c75db6d335a0335e944e5196a102d8837cad6b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 15 七月 2024 21:00:28 +0800
Subject: [PATCH] 工时bug修改+光纤接头损耗报告完成
---
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
index 54dc7ce..69723bd 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
@@ -6,12 +6,16 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.SampleProductDto;
+import com.yuanchu.mom.dto.SampleProductDto3;
import com.yuanchu.mom.pojo.InsProduct;
import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.vo.InsOrderPlanTaskSwitchVo;
import com.yuanchu.mom.vo.InsOrderPlanVO;
+import com.yuanchu.mom.vo.SampleVo;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
+import java.util.Map;
/**
* @author Administrator
@@ -29,6 +33,8 @@
List<SampleProductDto> selectSampleProductListByOrderId2(Integer id);
+ List<SampleProductDto3> selectSampleProductListByOrderId3(List<Integer> ids);
+
List<SampleProductDto> getInsOrderAndSample(Integer id, String laboratory);
String getSampleEn(String sample);
@@ -38,6 +44,10 @@
List<InsProduct> getInsProduct2(Integer id);
List<InsProduct> getInsProduct3(Integer id);
+
+ List<Map<String, Object>> getReportModel(@Param("orderId") Integer orderId, @Param("id") Integer id, @Param("laboratory") String laboratory);
+
+ SampleVo getDetailById(Integer sampleId);
}
--
Gitblit v1.9.3