zouxuan 2 лет назад
Родитель
Сommit
c1362ea478

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/DegreeRegistrationDto.java

@@ -15,6 +15,6 @@ public class DegreeRegistrationDto{
     @ApiModelProperty(value = "乐理级别证书",required = false)
     private String theoryCert;
 
-    @ApiModelProperty(value = "1乐器考级、2乐理考级",required = false)
+    @ApiModelProperty(value = "专业考级、2乐理考级",required = false)
     private DegreeTypeEnum type;
 }

+ 2 - 2
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ChildrenDayDegreeDetail.java

@@ -26,9 +26,9 @@ public class ChildrenDayDegreeDetail extends BaseEntity {
     private Integer userId;
 
     /**
-    * 类型 1-乐器考级 2-乐理考级 3-vip 4-乐理
+    * 类型 1-专业考级 2-乐理考级 3-vip 4-乐理
     */
-    @ApiModelProperty(value="类型 1-乐器考级 2-乐理考级 3-vip 4-乐理")
+    @ApiModelProperty(value="类型 1-专业考级 2-乐理考级 3-vip 4-乐理")
     private Integer type;
 
     /**

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/enums/DegreeTypeEnum.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.ym.mec.common.enums.BaseEnum;
 
 public enum DegreeTypeEnum implements BaseEnum<String, ComplaintsStatusEnum> {
-    GRADE("GRADE", "乐器考级"),
+    GRADE("GRADE", "专业考级"),
     THEORY("THEORY", "乐理考级");
 
     @EnumValue

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

@@ -349,7 +349,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());

+ 1 - 1
mec-student/src/main/java/com/ym/mec/student/controller/ChildrenDayDegreeDetailController.java

@@ -33,7 +33,7 @@ public class ChildrenDayDegreeDetailController extends BaseController {
     @Autowired
     private StudentDao studentDao;
 
-    @ApiOperation(value = "获取用户已报名的详情,类型 1-乐器考级 2-乐理考级 3-vip1v1,4-vip1v2 5-乐理课")
+    @ApiOperation(value = "获取用户已报名的详情,类型 1-专业考级 2-乐理考级 3-vip1v1,4-vip1v2 5-乐理课")
     @GetMapping("/getUserDegreeInfo")
     public HttpResponseResult<ChildrenDayDetailDto> getFeeInfo() {
         SysUser user = sysUserFeignService.queryUserInfo();