select_subject还原为exam_major,使用原来的名称

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

@@ -135,7 +135,7 @@ public class FrontPaperController {
     public List<LearnPaper> list(LearnPaper learnPaper) {
         SysUser sysUser = SecurityUtils.getLoginUser().getUser();
         learnPaper.setPaperType(PaperType.Simulated.name());
-        String subjectKey = NumberUtils.isPositive(learnPaper.getSubjectId()) ? String.valueOf(sysUser.getSelectSubject()) : "0";
+        String subjectKey = NumberUtils.isPositive(learnPaper.getSubjectId()) ? String.valueOf(sysUser.getExamMajor()) : "0";
         learnPaper.setLocations(sysUser.getLocation());
         learnPaper.setDirectKey(sysUser.getExamType().name() + "_" + subjectKey);
         List<LearnPaper> list = learnPaperService.selectLearnPaperList(learnPaper);

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

@@ -144,7 +144,7 @@ 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.getSelectSubject(), user.getLocation())); // TODO MF
+            arr = universitiesService.selectMajorWishUniversitiesListSimpleByMap2(cond.toCondMap(planYear, user.getExamType().title(), user.getExamMajor(), user.getLocation())); // TODO MF
         } else {
             arr = universitiesService.selectMajorWishUniversitiesListSimpleByMap(cond.toCondMap(planYear, Constant.EXAM_TYPE_PG, null, user.getLocation()));
         }
@@ -176,7 +176,7 @@ public class FrontUniversitiesController extends BaseController {
         this.saveUniversitiesClicks(code);
 
         if(Constant.EXAM_TYPE_ZG.equals(sysUser.getExamType().title())) {
-            Integer examMajor = sysUser.getSelectSubject(); // TODO MF
+            Integer examMajor = sysUser.getExamMajor();
 
             BBusiWishUniversitySubmitRecruitPlan planCond = new BBusiWishUniversitySubmitRecruitPlan();
             planCond.setUniversityId(universityId);

ie-admin/src/main/java/com/ruoyi/web/service/StudentService.java

@@ -65,7 +65,7 @@ public class StudentService {
                 return list;
             }
             subjectIdSet = Sets.newHashSet(1L, 2L, 3L);
-            Integer userSubjectId = SecurityUtils.getLoginUser().getUser().getSelectSubject();
+            Integer userSubjectId = SecurityUtils.getLoginUser().getUser().getExamMajor();
             if(null != userSubjectId) {
                 subjectIdSet.add(userSubjectId.longValue());
             }

ie-admin/src/main/java/com/ruoyi/web/service/SysRegisterService.java

@@ -215,6 +215,7 @@ public class SysRegisterService
         user.setNickName(register.getNickName());
         user.setLocation(register.getLocation());
         user.setExamType(register.getExamType());
+        user.setExamMajor(register.getExamMajor());
         user.setEndYear(register.getEndYear());
         user.setScores(register.getScores());
         user.setSchoolId(register.getSchoolId());

ie-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -137,8 +137,8 @@ public class SysUser extends BaseEntity
     /** 考试成绩  {} **/
     private SubjectScore scores;
 
-    /** 选科ID **/
-    private Integer selectSubject;
+    /** 考生专业类别 **/
+    private Integer examMajor;
 
     @JsonIgnore
     private String directedStudy;
@@ -514,12 +514,12 @@ public class SysUser extends BaseEntity
         this.scores = scores;
     }
 
-    public Integer getSelectSubject() {
-        return selectSubject;
+    public Integer getExamMajor() {
+        return examMajor;
     }
 
-    public void setSelectSubject(Integer selectSubject) {
-        this.selectSubject = selectSubject;
+    public void setExamMajor(Integer examMajor) {
+        this.examMajor = examMajor;
     }
 
     public String getDirectedStudy() {

ie-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java

@@ -21,6 +21,8 @@ public class RegisterBody extends LoginBody
     String location;
     @ApiModelProperty(value = "考生类型字典", example = "OHS")
     ExamType examType;
+    @ApiModelProperty(value = "专业科目类型", example = "1")
+    Integer examMajor;
     @ApiModelProperty(value = "毕业年份", example = "2028")
     Integer endYear;
     @ApiModelProperty("邀请码")

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

@@ -160,7 +160,7 @@ public class BBusiWishUniversitiesServiceImpl implements IBBusiWishUniversitiesS
         cond.put("collegeCode", code);
         cond.put("examineeType", u.getExamType().title());
         cond.put("examType", examTypeData);
-        cond.put("examMajor", u.getSelectSubject()); // TODO MF
+        cond.put("examMajor", u.getExamMajor());
         List<BBusiWishUniversitiesProfession> professionList = universitiesProfessionMapper.selectEnrollPlanProfessionByCode(cond);
         //设置数量
         Map<String,Integer> codeCountMap = syMajorService.selectSyMajorByLevel(examTypeData, 3).stream().collect(Collectors.toMap(t -> t.getCode(), SyMajor::getChildCount));

ie-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="endYear"       column="end_year"     />
 		<result property="inviteCode"    column="invite_code"     />
 		<result property="scores"        column="scores" typeHandler="com.ruoyi.system.handlers.SubjectScoreTypeHandler"        />
-		<result property="selectSubject" column="select_subject"       />
+		<result property="examMajor"     column="exam_major"       />
 		<result property="directedStudy" column="directed_study"       />
 		<result property="evalCounts"     column="eval_counts" />
 		<result property="cardId"        column="card_id"         />
@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<sql id="selectUserVo">
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark,
-		u.location,u.exam_type,u.reg_status,u.end_year,u.invite_code,u.scores,u.select_subject,u.directed_study,u.eval_counts,u.card_id,u.account_type,
+		u.location,u.exam_type,u.reg_status,u.end_year,u.invite_code,u.scores,u.exam_major,u.directed_study,u.eval_counts,u.card_id,u.account_type,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status, u.user_type, u.user_type_id
         from sys_user u
@@ -280,14 +280,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectUserByUserIds" resultMap="SysUserResult">
 		select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.password2, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark,
-		u.location,u.exam_type,u.reg_status,u.end_year,u.invite_code,u.scores,u.select_subject,u.directed_study,u.eval_counts,u.card_id,u.account_type
+		u.location,u.exam_type,u.reg_status,u.end_year,u.invite_code,u.scores,u.exam_major,u.directed_study,u.eval_counts,u.card_id,u.account_type
         from sys_user u
 		where u.user_id in <foreach collection="ids" item="id" open="(" separator="," close=")">#{id}</foreach>
 	</select>
 
 	<select id="selectUserByUserNames" resultMap="SysUserResult">
 		select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.password2, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark,
-		u.location,u.exam_type,u.reg_status,u.end_year,u.invite_code,u.scores,u.select_subject,u.directed_study,u.eval_counts,u.card_id,u.account_type
+		u.location,u.exam_type,u.reg_status,u.end_year,u.invite_code,u.scores,u.exam_major,u.directed_study,u.eval_counts,u.card_id,u.account_type
         from sys_user u
 		where u.user_name in <foreach collection="userNames" item="userName" open="(" separator="," close=")">#{userName}</foreach>
 		and u.del_flag = '0'
@@ -335,7 +335,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		    <if test="inviteCode != null and inviteCode != ''">invite_code,</if>
 		    <if test="scores != null and scores != ''">scores,</if>
 		    <if test="evalCounts != null">eval_counts,</if>
-		    <if test="selectSubject != null and selectSubject != ''">select_subject,</if>
+		    <if test="examMajor != null and examMajor != ''">exam_major,</if>
 		    <if test="directedStudy != null and directedStudy != ''">directed_study,</if>
 		    <if test="cardId != null and cardId != ''">card_id,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
@@ -364,7 +364,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="inviteCode != null and inviteCode != ''">#{inviteCode},</if>
  			<if test="scores != null and scores != ''">#{scores, typeHandler=com.ruoyi.system.handlers.SubjectScoreTypeHandler},</if>
 		    <if test="evalCounts != null">#{evalCounts},</if>
- 			<if test="selectSubject != null and selectSubject != ''">#{selectSubject},</if>
+ 			<if test="examMajor != null and examMajor != ''">#{examMajor},</if>
  			<if test="directedStudy != null and directedStudy != ''">#{directedStudy},</if>
  			<if test="cardId != null and cardId != ''">#{cardId},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
@@ -395,7 +395,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="endYear != null">end_year = #{endYear},</if>
 			<if test="inviteCode != null and inviteCode != ''">invite_code = #{inviteCode},</if>
 			<if test="scores != null and scores != ''">scores = #{scores, typeHandler=com.ruoyi.system.handlers.SubjectScoreTypeHandler},</if>
-			<if test="selectSubject != null and selectSubject != ''">select_subject = #{selectSubject},</if>
+			<if test="examMajor != null and examMajor != ''">exam_major = #{examMajor},</if>
 			<if test="directedStudy != null and directedStudy != ''">directed_study = #{directedStudy},</if>
 			<if test="evalCounts != null and evalCounts != ''">eval_counts = #{evalCounts},</if>
 			<if test="cardId != null and cardId != ''">card_id = #{cardId},</if>