考级报名

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

@@ -321,7 +321,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             DegreeRegistration userLevelDegree = degreeRegistrationDao.getUserLevelDegrees(degreeRegistration.getUserId(),
                     degree.getId(),DegreeTypeEnum.GRADE,levels,degreeRegistration.getSubjectId());
             if(Objects.nonNull(userLevelDegree)){
-                return BaseController.failed(HttpStatus.CREATED, "您选择的 " + userLevelDegree.getLevel() +  " 乐器考级已报名，请勿重复选择");
+                return BaseController.failed(HttpStatus.CREATED, "您选择的 乐器考级/级别" + userLevelDegree.getLevel() +  " 已报名，请勿重复选择");
             }
         }
         collect = registrationDtos.stream().filter(e -> e.getType() == DegreeTypeEnum.THEORY).collect(Collectors.toList());
@@ -330,7 +330,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             DegreeRegistration userLevelDegree = degreeRegistrationDao.getUserLevelDegrees(degreeRegistration.getUserId(),
                     degree.getId(),DegreeTypeEnum.THEORY,levels,degreeRegistration.getSubjectId());
             if(Objects.nonNull(userLevelDegree)){
-                return BaseController.failed(HttpStatus.CREATED, "您选择的 " + userLevelDegree.getLevel() +  " 乐理考级已报名，请勿重复选择");
+                return BaseController.failed(HttpStatus.CREATED, "您选择的  乐理考级/级别" + userLevelDegree.getLevel() +  " 已报名，请勿重复选择");
             }
         }
         return BaseController.succeed();

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

@@ -16,6 +16,7 @@
         <result column="city_" jdbcType="VARCHAR" property="city"/>
         <result column="school_" jdbcType="VARCHAR" property="school"/>
         <result column="subject_id_" property="subjectId"/>
+        <result column="subjectName" property="subjectName"/>
         <result column="level_" jdbcType="VARCHAR" property="level"/>
         <result column="theory_cert_" jdbcType="VARCHAR" property="theoryCert"/>
         <result column="mobile_" jdbcType="VARCHAR" property="mobile"/>
@@ -333,7 +334,9 @@
         SELECT * FROM degree_registration WHERE order_no_ = #{orderNo} FOR UPDATE
     </select>
     <select id="findByByOrderId" resultMap="DegreeRegistration">
-        SELECT * FROM degree_registration WHERE order_no_ = #{orderNo}
+        SELECT dr.*,s.name_ subjectName FROM degree_registration dr
+        left join subject s ON s.id_ = dr.subject_id_
+        WHERE dr.order_no_ = #{orderNo}
     </select>
 
     <select id="selectByDegreeId" resultMap="DegreeRegistration">