jinxia.mo 1 月之前
父節點
當前提交
4328097584

+ 2 - 2
ie-admin/src/main/java/com/ruoyi/web/controller/front/FrontUniversitiesController.java

@@ -186,9 +186,9 @@ public class FrontUniversitiesController extends BaseController {
         Integer planYear = voluntaryService.getPlanYear(user);
         if(Constant.EXAM_TYPE_ZG.equals(user.getExamType().title())) {
             //职高对口
-            arr = universitiesService.selectMajorWishUniversitiesListSimpleByMap2(cond.toCondMap(planYear, user.getExamType().title(), user.getExamMajor(), user.getLocation(),cond.getTier())); // TODO MF
+            arr = universitiesService.selectMajorWishUniversitiesListSimpleByMap2(cond.toCondMap(planYear, user.getExamType().title(), user.getExamMajor(), user.getLocation(),cond.getTiers())); // TODO MF
         } else {
-            arr = universitiesService.selectMajorWishUniversitiesListSimpleByMap(cond.toCondMap(planYear, Constant.EXAM_TYPE_PG, null, user.getLocation(),cond.getTier()));
+            arr = universitiesService.selectMajorWishUniversitiesListSimpleByMap(cond.toCondMap(planYear, Constant.EXAM_TYPE_PG, null, user.getLocation(),cond.getTiers()));
         }
         //处理院校星级竞争力
         arr.stream().forEach(t -> {

+ 4 - 2
ie-system/src/main/java/com/ruoyi/syzy/dto/UniversitiesCondDTO.java

@@ -63,18 +63,20 @@ public class UniversitiesCondDTO {
 
     private Boolean filterRank;
 
-    public Map toCondMap(Integer year, String entranceType, Integer examMajor, String rankLocation,Integer tier) {
+    public Map toCondMap(Integer year, String entranceType, Integer examMajor, String rankLocation,String tiers) {
         Map cond = Maps.newHashMap();
         cond.put("code", code);
         cond.put("name", name);
         cond.put("managerType", managerType);
         cond.put("majorCategory", majorCategory);
         cond.put("year", year);
-        cond.put("tier", tier);
         cond.put("rankLocation", StringUtils.trimToEmpty(rankLocation));
         if (StringUtils.isNotBlank(location)) {
             cond.put("locations", Arrays.asList(location.split(",")));
         }
+        if (StringUtils.isNotBlank(tiers)) {
+            cond.put("tiers", Arrays.asList(tiers.split(",")));
+        }
         if(StringUtils.isNotBlank(natureTypeCN)) {
             cond.put("natureTypeCNs", Arrays.asList(natureTypeCN.split(",")));
         }