From 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 16:26:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/basic/controller/EnumController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/EnumController.java b/src/main/java/com/ruoyi/basic/controller/EnumController.java
index 8091ac9..f4d172b 100644
--- a/src/main/java/com/ruoyi/basic/controller/EnumController.java
+++ b/src/main/java/com/ruoyi/basic/controller/EnumController.java
@@ -1,20 +1,21 @@
package com.ruoyi.basic.controller;
-import com.ruoyi.common.enums.StockRecordTypeEnum;
+import com.ruoyi.basic.utils.EnumUtils;
+import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.common.utils.EnumUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Anonymous;
import com.ruoyi.framework.web.domain.R;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
-@Api(tags = "鏋氫妇鎺ュ彛")
+@Tag(name = "鏋氫妇鎺ュ彛")
@RequestMapping("/basic/enum")
public class EnumController {
@@ -23,7 +24,13 @@
@GetMapping("/stockRecordType")
@Anonymous
public R getStockRecordTypeEnum(){
- List<Map<String, Object>> list = EnumUtil.toList(StockRecordTypeEnum.class);
+ List<Map<String, Object>> list = EnumUtil.toList(StockOutQualifiedRecordTypeEnum.class);
return R.ok(list);
}
+
+ @GetMapping("/{className}")
+ @Anonymous
+ public R stockRecordTypeByClassName(@PathVariable("className") String className){
+ return R.ok(EnumUtils.getOptions("com.ruoyi.common.enums." + className));
+ }
}
--
Gitblit v1.9.3