修改学生年级班级取值

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/FivePlusGradeEnum.java

@@ -31,6 +31,15 @@ public enum FivePlusGradeEnum implements BaseEnum<Integer, FivePlusGradeEnum> {
 		this.desc = desc;
 	}
 
+	public static FivePlusGradeEnum getByGradeNum(Integer currentGradeNum) {
+		for (FivePlusGradeEnum gradeEnum : FivePlusGradeEnum.values()) {
+			if (gradeEnum.getCode().equals(currentGradeNum)) {
+				return gradeEnum;
+			}
+		}
+		return FivePlusGradeEnum.GRADE1;
+	}
+
 	@Override
 	public Integer getCode() {
 		return code;

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -1554,7 +1554,11 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
     @Override
     public StudentRegistration queryUserByPhone(String mobile) {
-        return studentRegistrationDao.queryUserByPhone(mobile);
+        StudentRegistration studentRegistration = studentRegistrationDao.queryUserByPhone(mobile);
+        if (studentRegistration != null) {
+            studentRegistration.setCurrentGrade(FivePlusGradeEnum.getByGradeNum(studentRegistration.getCurrentGradeNum()).getDesc());
+        }
+        return studentRegistration;
     }
 
     @Override

mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -890,17 +890,15 @@
         SELECT su.id_,
         CASE WHEN sut.name_ IS NULL THEN su.real_name_ ELSE sut.name_ END parents_name_,
         su.phone_,
-        sr.current_grade_,
-        sr.current_grade_num_,
-        sr.current_class_,
+        st.current_grade_num_,
+        st.current_class_,
         su.username_ name_,
         su.birthdate_,
         su.gender_
         FROM sys_user su
         LEFT JOIN sys_user_tsign sut ON sut.user_id_ = su.id_
-        LEFT JOIN student_registration sr ON sr.user_id_ = su.id_
+        LEFT JOIN student st ON st.user_id_ = su.id_
         WHERE su.phone_ = #{mobile}
-        ORDER BY sr.id_ DESC
         LIMIT 1
     </select>
     <select id="queryPurchaseTypeMap" resultType="java.util.Map">