院校增加 tier

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

@@ -48,6 +48,11 @@ public class BBusiWishUniversities extends BaseEntity {
     @Excel(name = "学历层次")
     private String level;
 
+
+    /** 梯层 */
+    @Excel(name = "梯层")
+    private Integer tier;
+
     /** 一流大学建设高校(1:不是,2:是) */
     @Excel(name = "一流大学建设高校(1:不是,2:是)")
     private Integer ylxx;
@@ -228,6 +233,14 @@ public class BBusiWishUniversities extends BaseEntity {
         return level;
     }
 
+    public Integer getTier() {
+        return tier;
+    }
+
+    public void setTier(Integer tier) {
+        this.tier = tier;
+    }
+
     public void setYlxx(Integer ylxx) {
         this.ylxx = ylxx;
     }

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

@@ -42,6 +42,9 @@ public class UniversitiesCondDTO {
     @ApiModelProperty("学历层次")
     private String level;
 
+    @ApiModelProperty("梯层")
+    private Integer tier;
+
     @ApiModelProperty("特色")
     private String features;
     private String bxType;
@@ -65,6 +68,7 @@ public class UniversitiesCondDTO {
         Map cond = Maps.newHashMap();
         cond.put("code", code);
         cond.put("name", name);
+        cond.put("tier", tier);
         cond.put("managerType", managerType);
         cond.put("majorCategory", majorCategory);
         cond.put("year", year);

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

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <result property="managerType" column="managerType" />
     <result property="type" column="type" />
     <result property="level" column="level" />
+    <result property="tier" column="tier" />
     <result property="ylxx" column="ylxx" />
     <result property="ylxk" column="ylxk" />
     <result property="yjsy" column="yjsy" />
@@ -64,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
   </resultMap>
 
   <sql id="selectBBusiWishUniversitiesVo">
-    select id, code, name, logo, location, managerType, type, level, tel, url, favorities, createTime, status,
+    select id, code, name, logo, location, managerType, type, level, tier, tel, url, favorities, createTime, status,
         numberOfBSH,numberOfStu,comScore,rankingOfEdu,ranking,createdYear,shuoShiZBWZ,vrUrl,motto,zhaoBanWZ,shortName,cityName,
         enName,introduction,star,vrShortUrl,celebrateDay,natureType,majorRule,pointsOfBo,pointsOfShuo,bxLevel,features,
         entranceType,shuoShiZBDH,bxType,zhaoBanDH,address,hits,natureTypeCN,bannerUrl,webSite,area,enrollLocation,collect
@@ -87,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
   </select>
 
   <select id="selectBBusiWishUniversitiesListSimpleByIds" parameterType="map" resultMap="BBusiWishUniversitiesResult">
-    select id, code, name, logo, location, managerType, type, level,
+    select id, code, name, logo, location, managerType, type, level, tier,
     comScore,rankingOfEdu,ranking,cityName,
     bxLevel,features,hits,natureTypeCN,bannerUrl,webSite,area,enrollLocation,collect,star,address
     from b_busi_wish_universities where status>0 and
@@ -108,7 +109,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
       <if test="location != null  and location != ''"> and location = #{location}</if>
       <if test="managerType != null  and managerType != ''"> and managerType = #{managerType}</if>
       <if test="type != null  and type != ''"> and type like concat('%', #{type}, '%')</if>
-      <if test="level != null  and level != ''"> and level = #{level}</if>
+      <if test="tier != null  and tier == 0"> and tier is not null</if>
+      <if test="tier != null  and tier > 0"> and tier = #{tier}</if>
       <if test="ylxx != null "> and ylxx = #{ylxx}</if>
       <if test="ylxk != null "> and ylxk = #{ylxk}</if>
       <if test="yjsy != null "> and yjsy = #{yjsy}</if>
@@ -126,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
   </select>
 
   <select id="listMyByPage" parameterType="String" resultMap="BBusiWishUniversitiesResult">
-    select u.id, code, name, logo, location, managerType, type, level,
+    select u.id, code, name, logo, location, managerType, type, level, tier,
     comScore,rankingOfEdu,ranking,cityName,
     bxLevel,features,hits,natureTypeCN,bannerUrl,webSite,area,enrollLocation,collect,star,address
     from b_customer_universities cu join b_busi_wish_universities u on cu.universityId = u.id
@@ -138,7 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
   </select>
 
   <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,
+    SELECT DISTINCT u.id, u.code, u.name, logo, u.location, u.managerType, u.type, u.level, u.tier, 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
     FROM `b_busi_wish_universities` u
     <where>
@@ -150,6 +152,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
       <if test="managerType != null  and managerType != ''"> and u.managerType = #{managerType}</if>
       <if test="status != null "> and u.status = #{status}</if>
       <if test="entranceType != null "> and u.entranceType = #{entranceType}</if>
+      <if test="tier != null  and tier == 0"> and u.tier is not null</if>
+      <if test="tier != null  and tier > 0"> and u.tier = #{tier}</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>
       <if test="natureTypeCNs != null"> and <foreach item="o" collection="natureTypeCNs" open="(" separator=" OR " close=")">u.natureTypeCN like concat('%', #{o}, '%')</foreach></if>
@@ -179,7 +183,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
   </select>
 
   <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,
+    SELECT DISTINCT u.id, u.code, u.name, logo, u.location, u.managerType, u.type, u.level, u.tier, 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
     FROM `b_busi_wish_university_submit_recruit_plan` p
     JOIN `b_busi_wish_universities` u ON p.`universityId` = u.`id`
@@ -200,6 +204,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
       <if test="status != null "> and u.status = #{status}</if>
       <if test="entranceType != null "> and u.entranceType = #{entranceType}</if>
       <if test="examMajor != null "> and p.liberalScience = #{examMajor}</if>
+      <if test="tier != null  and tier == 0"> and u.tier is not null</if>
+      <if test="tier != null  and tier > 0"> and u.tier = #{tier}</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>
       <if test="natureTypeCNs != null"> and <foreach item="o" collection="natureTypeCNs" open="(" separator=" OR " close=")">u.natureTypeCN like concat('%', #{o}, '%')</foreach></if>
@@ -227,7 +233,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
   </select>
 
   <select id="selectBBusiWishUniversitiesListSimpleByMap" parameterType="map" resultMap="BBusiWishUniversitiesResult">
-    select id, code, name, logo, location, managerType, type, level,
+    select id, code, name, logo, location, managerType, type, level, tier,
     comScore,rankingOfEdu,ranking,cityName,
     bxLevel,features,hits,natureTypeCN,bannerUrl,webSite,area,enrollLocation,collect,star,address
     from b_busi_wish_universities
@@ -239,6 +245,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
       <if test="managerType != null  and managerType != ''"> and managerType = #{managerType}</if>
       <if test="status != null "> and status = #{status}</if>
       <if test="entranceType != null "> and u.entranceType = #{entranceType}</if>
+      <if test="tier != null  and tier == 0"> and u.tier is not null</if>
+      <if test="tier != null  and tier > 0"> and u.tier = #{tier}</if>
 
       <if test="locations != null"> and location in <foreach item="o" collection="locations" open="(" separator="," close=")">#{o}</foreach></if>
       <if test="types != null"> and <foreach item="o" collection="types" open="(" separator=" OR " close=")">type like concat('%', #{o}, '%')</foreach></if>
@@ -269,7 +277,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
   </select>
 
   <select id="selectBBusiWishUniversitiesListSimple" parameterType="BBusiWishUniversities" resultMap="BBusiWishUniversitiesResult">
-    select id, code, name, logo, location, managerType, type, level,
+    select id, code, name, logo, location, managerType, type, level, tier,
     comScore,rankingOfEdu,ranking,cityName,
     bxLevel,features,hits,natureTypeCN,bannerUrl,webSite,area,enrollLocation,collect
     from b_busi_wish_universities
@@ -282,6 +290,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
       <if test="managerType != null  and managerType != ''"> and managerType = #{managerType}</if>
       <if test="type != null  and type != ''"> and type like concat('%', #{type}, '%')</if>
       <if test="level != null  and level != ''"> and level = #{level}</if>
+      <if test="tier != null  and tier == 0"> and tier is not null</if>
+      <if test="tier != null  and tier > 0"> and tier = #{tier}</if>
       <if test="status != null "> and status = #{status}</if>
       <if test="natureTypeCN != null  and natureTypeCN != ''"> and natureTypeCN like concat('%', #{natureTypeCN}, '%')</if>
       <if test="features != null  and features != ''"> and features like concat('%', #{features}, '%')</if>
@@ -343,6 +353,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
       <if test="managerType != null">managerType,</if>
       <if test="type != null">type,</if>
       <if test="level != null">level,</if>
+      <if test="tier != null">tier,</if>
       <if test="ylxx != null">ylxx,</if>
       <if test="ylxk != null">ylxk,</if>
       <if test="yjsy != null">yjsy,</if>
@@ -364,6 +375,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
       <if test="managerType != null">#{managerType},</if>
       <if test="type != null">#{type},</if>
       <if test="level != null">#{level},</if>
+      <if test="tier != null">#{tier},</if>
       <if test="ylxx != null">#{ylxx},</if>
       <if test="ylxk != null">#{ylxk},</if>
       <if test="yjsy != null">#{yjsy},</if>
@@ -389,6 +401,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
       <if test="managerType != null">managerType = #{managerType},</if>
       <if test="type != null">type = #{type},</if>
       <if test="level != null">level = #{level},</if>
+      <if test="tier != null">level = #{tier},</if>
       <if test="ylxx != null">ylxx = #{ylxx},</if>
       <if test="ylxk != null">ylxk = #{ylxk},</if>
       <if test="yjsy != null">yjsy = #{yjsy},</if>