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/controller/StandardMethodController.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardMethodController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardMethodController.java
index 3be398d..7c9594a 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardMethodController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardMethodController.java
@@ -21,9 +21,10 @@
private StandardMethodService standardMethodService;
@Operation(summary = "鑾峰彇鏍囧噯鏂规硶鍒楄〃")
- @PostMapping("/selectStandardMethodList")
- public Result selectStandardMethodList(Page page,StandardMethod standardMethod) throws Exception {
- return Result.success(standardMethodService.selectStandardMethodList(page, standardMethod));
+ @GetMapping("/selectStandardMethodList")
+ public Result selectStandardMethodList(Page page, StandardMethod standardMethod,
+ @RequestParam(value = "industryId", required = false) Integer industryId) {
+ return Result.success(standardMethodService.selectStandardMethodList(page, standardMethod, industryId));
}
@Operation(summary = "鑾峰彇鏍囧噯鏂规硶鏋氫妇")
@@ -39,7 +40,7 @@
}
@Operation(summary = "鍒犻櫎鏍囧噯鏂规硶")
- @PostMapping("/delStandardMethod")
+ @DeleteMapping("/delStandardMethod")
public Result<?> delStandardMethod(Integer id) {
return Result.success(standardMethodService.delStandardMethod(id));
}
@@ -50,10 +51,29 @@
return Result.success(standardMethodService.upStandardMethod(standardMethod));
}
- @Operation(summary = "瀵煎叆鏍囧噯鏄庣粏")
- @PostMapping("/importStandardDetails")
- public Result<?> importStandardDetails(@RequestPart("file") MultipartFile file) throws IOException {
- standardMethodService.inputExcel(file);
- return Result.success();
+ @Operation(summary = "鑾峰彇琛屼笟閫夐」")
+ @GetMapping("/selectIndustryOptions")
+ public Result selectIndustryOptions() {
+ return Result.success(standardMethodService.selectIndustryOptions());
}
+
+ @Operation(summary = "鏌ヨ鏍囧噯闄勪欢")
+ @GetMapping("/selectAttachments")
+ public Result selectAttachments(Integer standardMethodId) {
+ return Result.success(standardMethodService.selectAttachments(standardMethodId));
+ }
+
+ @Operation(summary = "涓婁紶鏍囧噯闄勪欢")
+ @PostMapping("/uploadAttachment")
+ public Result uploadAttachment(@RequestParam("standardMethodId") Integer standardMethodId,
+ @RequestParam("file") MultipartFile file) {
+ return Result.success(standardMethodService.uploadAttachment(standardMethodId, file));
+ }
+
+ @Operation(summary = "鍒犻櫎鏍囧噯闄勪欢")
+ @DeleteMapping("/deleteAttachment")
+ public Result deleteAttachment(Long id) {
+ return Result.success(standardMethodService.deleteAttachment(id));
+ }
+
}
--
Gitblit v1.9.3