From 476740c4330135b38be6a32f54dbe1bbcd32476a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 13 一月 2025 13:20:56 +0800
Subject: [PATCH] Merge branch 'master' into cnas
---
inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
index a1ffb3d..abd212f 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
@@ -4,7 +4,10 @@
import com.yuanchu.mom.dto.FactoryDto;
import com.yuanchu.mom.dto.SampleTypeDto;
import com.yuanchu.mom.pojo.StandardTree;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -16,6 +19,7 @@
public interface StandardTreeService extends IService<StandardTree> {
List<FactoryDto> selectStandardTreeList();
+ List<SampleTypeDto> selectStandardTreeList2();
int addStandardTree(StandardTree standardTree);
@@ -27,6 +31,17 @@
int upStandardProducts(Map<String, Object> product);
- List<StandardTree> getStandTreeBySampleType();
+ List<StandardTree> getStandTreeBySampleType(String laboratory, String sampleType);
+ void inExcelOfTree(MultipartFile file);
+
+ void resetTreeOfPrice(String tree, Integer standardId);
+
+ void resetTreeOfHour(String tree, Integer standardId);
+
+ void resetTreeOfAsk(String tree, Integer standardId);
+
+ void importWorkstationExcel(MultipartFile file);
+
+ void exportStandTree(HttpServletResponse response) throws IOException;
}
--
Gitblit v1.9.3