Merge branch 'master' of http://49.234.186.218:9000/root/ieplus

back-ui/src/views/dz/papers/index.vue

@@ -6,11 +6,11 @@
                     <component :is="t.page" v-if="t.visited" :key="t.name" :ref="el => setComponentRef(t.name, el)"/>
                 </el-tab-pane>
             </el-tabs>
-            <el-button 
-                type="primary" 
-                :icon="Refresh" 
-                circle 
-                size="small" 
+            <el-button
+                type="primary"
+                :icon="Refresh"
+                circle
+                size="small"
                 @click="handleRefresh"
                 class="refresh-btn"
                 title="刷新当前页面数据"
@@ -26,7 +26,6 @@ import PaperExactIntelligent from "@/views/dz/papers/components/paper-exact-inte
 import PaperFullIntelligent from "@/views/dz/papers/components/paper-full-intelligent.vue";
 import PaperExactHand from "@/views/dz/papers/components/paper-exact-hand.vue";
 import PaperFullHand from "@/views/dz/papers/components/paper-full-hand.vue";
-import PaperRecords from "@/views/dz/papers/components/paper-records.vue";
 import {Refresh} from "@element-plus/icons-vue";
 
 const {loading} = useProvideGlobalLoading()
@@ -51,11 +50,6 @@ const tabs = ref([{
     label: '全量手动',
     page: markRaw(PaperFullHand),
     visited: false
-}, {
-    name: 'PaperRecords',
-    label: '试卷记录',
-    page: markRaw(PaperRecords),
-    visited: false
 }])
 const currentTab = ref('ExactIntelligent')
 

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

@@ -224,14 +224,11 @@ public class FrontSyMajorRelationController extends BaseController {
         List<SyMajor> majorList = syMajorService.selectSyMajorList(query);
         List<SyVocational> toList = new ArrayList<>();
 
-        LoginUser loginUser = SecurityUtils.getLoginUser();
         List<String>  majorListByPlan = new ArrayList<>();
         //湖南：计划中有的专业加入
-        if (null != loginUser){
-            String location = loginUser.getUser().getLocation();
-            if ("湖南".equals(location)){
-                majorListByPlan = syMajorService.selectMajorsByPlan(location).stream().map(major->major.getName()).collect(Collectors.toList());
-            }
+        String location = VistorContextHolder.getLocation();
+        if ("湖南".equals(location)){
+            majorListByPlan = syMajorService.selectMajorsByPlan(location).stream().map(major->major.getName()).collect(Collectors.toList());
         }
         Boolean isFilter = false;
         for (SyMajor major : majorList) {

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

@@ -42,6 +42,7 @@ public class FrontSyVocationalController extends BaseController {
 
     @GetMapping("getVocationalPostDetailByPostName")
     @ApiOperation("05 根据就业岗位名称获取岗位详情")
+    @Anonymous
     public AjaxResult getVocationalPostDetailByPostName(@RequestParam(required = true) String postName) {
         SyVocationalPostDetail vocationalPostDetail = vocationalPostDetailService.selectSyVocationalPostDetailByName(postName);
         return AjaxResult.success(vocationalPostDetail);

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.getTiers())); // 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.getTiers()));
         }
         //处理院校星级竞争力
         arr.stream().forEach(t -> {

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 String tierName;
 
     /** 一流大学建设高校(1:不是,2:是) */
     @Excel(name = "一流大学建设高校(1:不是,2:是)")
@@ -126,6 +127,14 @@ public class BBusiWishUniversities extends BaseEntity {
     private String enrollLocation;
     private Boolean collected;
 
+    public String getTierName() {
+        return tierName;
+    }
+
+    public void setTierName(String tierName) {
+        this.tierName = tierName;
+    }
+
     public Integer getArea() {
         return area;
     }

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,7 +63,7 @@ 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,String tiers) {
         Map cond = Maps.newHashMap();
         cond.put("code", code);
         cond.put("name", name);
@@ -73,6 +74,9 @@ public class UniversitiesCondDTO {
         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(",")));
         }

ie-system/src/main/java/com/ruoyi/syzy/service/impl/BBusiWishUniversitiesServiceImpl.java

@@ -11,6 +11,7 @@ import com.ruoyi.syzy.dto.UniversityDetailDTO;
 import com.ruoyi.syzy.mapper.*;
 import com.ruoyi.syzy.service.IBBusiWishUniversitiesEnrollBrochureService;
 import com.ruoyi.syzy.service.IBBusiWishUniversitiesService;
+import com.ruoyi.system.service.ISysDictTypeService;
 import com.ruoyi.util.ConstantUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -40,6 +41,8 @@ public class BBusiWishUniversitiesServiceImpl implements IBBusiWishUniversitiesS
     private BBusiWishUniversitiesSubjectMapper universitiesSubjectMapper;
     @Autowired
     private IBBusiWishUniversitiesEnrollBrochureService universitiesEnrollBrochureService;
+    @Autowired
+    private ISysDictTypeService dictTypeService;
 
 
 
@@ -55,7 +58,17 @@ public class BBusiWishUniversitiesServiceImpl implements IBBusiWishUniversitiesS
 
     @Override
     public BBusiWishUniversities selectBBusiWishUniversitiesByCode(String code) {
-        return bBusiWishUniversitiesMapper.selectBBusiWishUniversitiesByCode(code);
+        BBusiWishUniversities result  = bBusiWishUniversitiesMapper.selectBBusiWishUniversitiesByCode(code);
+        if(result != null){
+            // 如果tier有值，则从字典dict_type=tier_type中取到值并将label赋值给tierName
+            if(result.getTier() != null){
+                String tierName = dictTypeService.getDictDataByType("tier_type", String.valueOf(result.getTier()));
+                if(tierName != null && !tierName.isEmpty()){
+                    result.setTierName(tierName);
+                }
+            }
+        }
+        return result;
     }
 
     /**

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

@@ -61,13 +61,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <result property="area" column="area" />
     <result property="enrollLocation" column="enrollLocation" />
     <result property="collect" column="collect" />
+    <result property="tier" column="tier" />
   </resultMap>
 
   <sql id="selectBBusiWishUniversitiesVo">
     select id, code, name, logo, location, managerType, type, level, 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
+        entranceType,shuoShiZBDH,bxType,zhaoBanDH,address,hits,natureTypeCN,bannerUrl,webSite,area,enrollLocation,collect,tier
         from b_busi_wish_universities
   </sql>
 
@@ -149,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>
@@ -197,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>