From 4efd37516a0723c67a2644ab0ddcf86013af6a4b Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期三, 28 十月 2026 17:57:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodService.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodService.java
index d9b3432..64c1e72 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodService.java
@@ -4,10 +4,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.pojo.StandardMethod;
+import com.ruoyi.basic.pojo.StandardMethodList;
+import com.ruoyi.basic.pojo.StandardMethodAttachment;
+import com.ruoyi.basic.pojo.Laboratory;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.List;
+import java.util.Map;
/**
* @author Administrator
@@ -16,15 +20,26 @@
*/
public interface StandardMethodService extends IService<StandardMethod> {
- IPage<StandardMethod> selectStandardMethodList(Page page, StandardMethod standardMethod);
+ IPage<StandardMethod> selectStandardMethodList(Page page, StandardMethod standardMethod, Integer industryId);
List<StandardMethod> selectStandardMethods();
- int addStandardMethod(StandardMethod standardMethod);
+ Integer addStandardMethod(StandardMethod standardMethod);
int delStandardMethod(Integer id);
int upStandardMethod(StandardMethod standardMethod);
- void inputExcel(MultipartFile file) throws IOException;
+ Map<String, List<?>> selectsStandardMethodByFLSSM(String tree);
+
+ List<StandardMethodList> selectStandardMethodEnum();
+
+ List<StandardMethodAttachment> selectAttachments(Integer standardMethodId);
+
+ StandardMethodAttachment uploadAttachment(Integer standardMethodId, MultipartFile file);
+
+ boolean deleteAttachment(Long id);
+
+ List<Laboratory> selectIndustryOptions();
+
}
--
Gitblit v1.9.3