From c0fd46ed9c7ddf7a3ea4e6a972474e9a62c68a1a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 22 七月 2024 19:59:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 ebba737..8496f6a 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
@@ -1,11 +1,13 @@
package com.yuanchu.mom.service;
-import com.yuanchu.mom.dto.FactoryDto;
-import com.yuanchu.mom.pojo.StandardProductList;
-import com.yuanchu.mom.pojo.StandardTree;
import com.baomidou.mybatisplus.extension.service.IService;
+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 java.util.List;
+import java.util.Map;
/**
* @author Administrator
@@ -22,7 +24,19 @@
int addStandardProduct(String ids, String tree);
-// 鏍规嵁鏍峰搧绫诲瀷杩涜鏍囧噯鏍戞洿鏂版搷浣�
- void reTreeBySampleType(String sampleType);
+ List<SampleTypeDto> getStandardTree2();
+ int upStandardProducts(Map<String, Object> product);
+
+ 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);
}
--
Gitblit v1.9.3