梯队

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())); // TODO MF
+            arr = universitiesService.selectMajorWishUniversitiesListSimpleByMap2(cond.toCondMap(planYear, user.getExamType().title(), user.getExamMajor(), user.getLocation(),cond.getTier())); // TODO MF
         } else {
-            arr = universitiesService.selectMajorWishUniversitiesListSimpleByMap(cond.toCondMap(planYear, Constant.EXAM_TYPE_PG, null, user.getLocation()));
+            arr = universitiesService.selectMajorWishUniversitiesListSimpleByMap(cond.toCondMap(planYear, Constant.EXAM_TYPE_PG, null, user.getLocation(),cond.getTier()));
         }
         //处理院校星级竞争力
         arr.stream().forEach(t -> {

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

@@ -52,6 +52,7 @@ public class UniversitiesCondDTO {
     private String codes;
     private String examMajor;
     private String tiers;
+    private Integer tier;
 
     /** 状态(0:无效,1:有效) */
     @ApiModelProperty("状态(0:无效,1:有效)")
@@ -62,13 +63,14 @@ public class UniversitiesCondDTO {
 
     private Boolean filterRank;
 
-    public Map toCondMap(Integer year, String entranceType, Integer examMajor, String rankLocation) {
+    public Map toCondMap(Integer year, String entranceType, Integer examMajor, String rankLocation,Integer tier) {
         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(",")));

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

@@ -150,6 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
       <if test="name != null  and name != ''"> and u.name like concat('%', #{name}, '%')</if>
       <if test="managerType != null  and managerType != ''"> and u.managerType = #{managerType}</if>
       <if test="status != null "> and u.status = #{status}</if>
+      <if test="tier != null "> and u.tier = #{tier}</if>
       <if test="entranceType != null "> and u.entranceType = #{entranceType}</if>
       <if test="types != null"> and <foreach item="o" collection="types" open="(" separator=" OR " close=")">u.type like concat('%', #{o}, '%')</foreach></if>
       <if test="levels != null"> and u.level in <foreach item="o" collection="levels" open="(" separator="," close=")">#{o}</foreach></if>
@@ -198,6 +199,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
       <if test="name != null  and name != ''"> and u.name like concat('%', #{name}, '%')</if>
       <if test="managerType != null  and managerType != ''"> and u.managerType = #{managerType}</if>
       <if test="status != null "> and u.status = #{status}</if>
+      <if test="tier != null "> and u.tier = #{tier}</if>
       <if test="entranceType != null "> and u.entranceType = #{entranceType}</if>
       <if test="examMajor != null "> and p.liberalScience = #{examMajor}</if>
       <if test="types != null"> and <foreach item="o" collection="types" open="(" separator=" OR " close=")">u.type like concat('%', #{o}, '%')</foreach></if>