|
|
@@ -20,10 +20,7 @@ import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
-import java.util.Arrays;
|
|
|
-import java.util.Collections;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Set;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
@@ -80,6 +77,25 @@ public class UserController {
|
|
|
}).collect(Collectors.toList()));
|
|
|
}
|
|
|
|
|
|
+ @GetMapping(value = "examTypes")
|
|
|
+ @Anonymous
|
|
|
+ @ApiOperation("专业类型列表")
|
|
|
+ public AjaxResult examMajor(@RequestParam String location, @RequestParam ExamType examType)
|
|
|
+ {
|
|
|
+ List<JSONObject> list = new ArrayList<>();
|
|
|
+ if(ExamType.VHS.equals(examType)) {
|
|
|
+ JSONObject o = new JSONObject();
|
|
|
+ o.put("dictValue", 1);
|
|
|
+ o.put("dictLabel", "农林类");
|
|
|
+ list.add(o);
|
|
|
+ o = new JSONObject();
|
|
|
+ o.put("dictValue", 2);
|
|
|
+ o.put("dictLabel", "养殖类");
|
|
|
+ list.add(o);
|
|
|
+ }
|
|
|
+ return AjaxResult.success(list);
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 登录方法
|
|
|
*
|