梯次院校列表增加tier_rank限制个数

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

@@ -140,12 +140,31 @@ public class FrontUniversitiesController extends BaseController {
         if(StringUtils.isNotBlank(location)){
             location = location+",全国";
         }
+        if(StringUtils.isBlank(cond.getTiers())) {
+            cond.setTiers("1,2,3,4,5,6,7,8");
+        }
         List<JSONObject> tierList = Lists.newArrayList();
         List<BBusiWishUniversities> arr = getUniversitiesList(cond,location,  -1, 15);
+        Collections.sort(arr, new Comparator<BBusiWishUniversities>() {
+            @Override
+            public int compare(BBusiWishUniversities o1, BBusiWishUniversities o2) {
+                int iRet;
+                if(null == o1.getTierRank()) {
+                    if(null != o2.getTierRank()) {
+                        return 1;
+                    }
+                } else if(null == o2.getTierRank()) {
+                    return -1;
+                } else if(0 != (iRet = o1.getTierRank().compareTo(o2.getTierRank()))) {
+                    return iRet;
+                }
+                return o1.getCode().compareTo(o2.getCode());
+            }
+        });
         Map<Integer, List<BBusiWishUniversities>> tierMap = arr.stream().filter(t -> null != t.getTier())
                 .collect(Collectors.groupingBy(BBusiWishUniversities::getTier, Collectors.toList()));
         List<SysDictData> tierTypeList = dictTypeService.selectDictDataByType("tier_type");
-        Set<String> tierSet = Sets.newHashSet(Arrays.asList((StringUtils.isBlank(cond.getTiers()) ? "1,2,3,4" : cond.getTiers()).split(",")));
+        Set<String> tierSet = Sets.newHashSet(Arrays.asList(cond.getTiers().split(",")));
         for(SysDictData dd : tierTypeList) {
             if(!tierSet.contains(dd.getDictValue())) {
                 continue;
@@ -155,7 +174,7 @@ public class FrontUniversitiesController extends BaseController {
             tierUniversities.put("typeName", dd.getDictLabel());
             tierUniversities.put("typeValue", dd.getDictValue());
             tierUniversities.put("desc", tierDescMap.get(dd.getDictValue()));
-            tierUniversities.put("list", uList);
+            tierUniversities.put("list", uList.size() > 10 ? uList.subList(0, 10) : uList);
             tierList.add(tierUniversities);
         }
         return AjaxResult2.success(tierList);

ie-system/src/main/java/com/ruoyi/syzy/domain/BBusiWishUniversities.java

@@ -49,6 +49,7 @@ public class BBusiWishUniversities extends BaseEntity {
     private String level;
 
     private Integer tier;
+    private Integer tierRank;
     private String tierName;
 
     /** 一流大学建设高校(1:不是,2:是) */
@@ -127,6 +128,14 @@ public class BBusiWishUniversities extends BaseEntity {
     private String enrollLocation;
     private Boolean collected;
 
+    public Integer getTierRank() {
+        return tierRank;
+    }
+
+    public void setTierRank(Integer tierRank) {
+        this.tierRank = tierRank;
+    }
+
     public String getTierName() {
         return tierName;
     }

ie-system/src/main/resources/mapper/syzy/BBusiWishUniversitiesMapper.xml

@@ -62,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <result property="enrollLocation" column="enrollLocation" />
     <result property="collect" column="collect" />
     <result property="tier" column="tier" />
+    <result property="tierRank" column="tier_rank" />
   </resultMap>
 
   <sql id="selectBBusiWishUniversitiesVo">
@@ -140,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
   <select id="selectMajorWishUniversitiesListSimpleByMap" parameterType="map" resultMap="BBusiWishUniversitiesResult">
     SELECT DISTINCT u.id, u.code, u.name, logo, u.location, u.managerType, u.type, u.level, u.comScore,u.rankingOfEdu,u.ranking,u.cityName,
-    u.bxLevel,u.features,u.hits,u.natureTypeCN,u.bannerUrl,u.webSite,u.area,u.enrollLocation,u.collect,u.star,u.address,u.tier
+    u.bxLevel,u.features,u.hits,u.natureTypeCN,u.bannerUrl,u.webSite,u.area,u.enrollLocation,u.collect,u.star,u.address,u.tier,u.tier_rank
     FROM `b_busi_wish_universities` u
     <where>
       u.status  >0
@@ -181,7 +182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
   <select id="selectMajorWishUniversitiesListSimpleByMap2" parameterType="map" resultMap="BBusiWishUniversitiesResult">
     SELECT DISTINCT u.id, u.code, u.name, logo, u.location, u.managerType, u.type, u.level, u.comScore,u.rankingOfEdu,u.ranking,u.cityName,
-    u.bxLevel,u.features,u.hits,u.natureTypeCN,u.bannerUrl,u.webSite,u.area,u.enrollLocation,u.collect,u.star,u.address,u.tier
+    u.bxLevel,u.features,u.hits,u.natureTypeCN,u.bannerUrl,u.webSite,u.area,u.enrollLocation,u.collect,u.star,u.address,u.tier,u.tier_rank
     FROM `b_busi_wish_university_submit_recruit_plan` p
     JOIN `b_busi_wish_universities` u ON p.`universityId` = u.`id`
     <if test="majorCategory != null and majorCategory != ''">