修改61排课资格,修改曲目排序

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ActivityCourseDetailDto.java

@@ -14,16 +14,12 @@ public class ActivityCourseDetailDto {
     private Integer vip2 = 0;
 
     @ApiModelProperty(value = "赠送vip", required = false)
-    private Integer freeVip = 0;
+    private Integer free_vip = 0;
 
     @ApiModelProperty(value = "乐理课", required = false)
-    private Integer musicTheory = 0;
+    private Integer music_theory = 0;
 
-    private BigDecimal musicTheoryPrice;
-
-    public void setMusicTheoryPrice(BigDecimal musicTheoryPrice) {
-        this.musicTheoryPrice = musicTheoryPrice;
-    }
+    private BigDecimal music_theory_price;
 
     public Integer getUserId() {
         return userId;
@@ -33,10 +29,6 @@ public class ActivityCourseDetailDto {
         this.userId = userId;
     }
 
-    public BigDecimal getMusicTheoryPrice() {
-        return musicTheoryPrice;
-    }
-
     public Integer getVip1() {
         return vip1;
     }
@@ -53,19 +45,27 @@ public class ActivityCourseDetailDto {
         this.vip2 = vip2;
     }
 
-    public Integer getFreeVip() {
-        return freeVip;
+    public Integer getFree_vip() {
+        return free_vip;
+    }
+
+    public void setFree_vip(Integer free_vip) {
+        this.free_vip = free_vip;
+    }
+
+    public Integer getMusic_theory() {
+        return music_theory;
     }
 
-    public void setFreeVip(Integer freeVip) {
-        this.freeVip = freeVip;
+    public void setMusic_theory(Integer music_theory) {
+        this.music_theory = music_theory;
     }
 
-    public Integer getMusicTheory() {
-        return musicTheory;
+    public BigDecimal getMusic_theory_price() {
+        return music_theory_price;
     }
 
-    public void setMusicTheory(Integer musicTheory) {
-        this.musicTheory = musicTheory;
+    public void setMusic_theory_price(BigDecimal music_theory_price) {
+        this.music_theory_price = music_theory_price;
     }
 }

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

@@ -911,17 +911,17 @@ public class StudentManageServiceImpl implements StudentManageService {
         if(!activityCourseDetailDto.getVip2().equals(0) && !activityCourseDetailDto.getVip2().equals(1)){
             throw new BizException("修改失败：排课次数异常");
         }
-        if(!activityCourseDetailDto.getFreeVip().equals(0) && !activityCourseDetailDto.getFreeVip().equals(1)){
+        if(!activityCourseDetailDto.getFree_vip().equals(0) && !activityCourseDetailDto.getFree_vip().equals(1)){
             throw new BizException("修改失败：排课次数异常");
         }
-        if(!activityCourseDetailDto.getMusicTheory().equals(0) && !activityCourseDetailDto.getMusicTheory().equals(1)){
+        if(!activityCourseDetailDto.getMusic_theory().equals(0) && !activityCourseDetailDto.getMusic_theory().equals(1)){
             throw new BizException("修改失败：排课次数异常");
         }
-        if(activityCourseDetailDto.getMusicTheory().equals(1)){
+        if(activityCourseDetailDto.getMusic_theory().equals(1)){
             String activityCourseDetail = student.getActivityCourseDetail();
             if(StringUtils.isNotEmpty(activityCourseDetail)){
                 ActivityCourseDetailDto detailDto = JSON.parseObject(activityCourseDetail, ActivityCourseDetailDto.class);
-                if(detailDto.getMusicTheory() == null || detailDto.getMusicTheory().equals(0)){
+                if(detailDto.getMusic_theory() == null || detailDto.getMusic_theory().equals(0)){
                     SysUser sysUser = sysUserFeignService.queryUserById(student.getUserId());
                     if(sysUser == null){
                         throw new BizException("请登录");
@@ -930,9 +930,9 @@ public class StudentManageServiceImpl implements StudentManageService {
                     if(degreeCourseFee == null){
                         throw new BizException("学员所在分部未配置考级价格");
                     }
-                    activityCourseDetailDto.setMusicTheoryPrice(degreeCourseFee.getTheory());
+                    activityCourseDetailDto.setMusic_theory_price(degreeCourseFee.getTheory());
                 }else {
-                    activityCourseDetailDto.setMusicTheoryPrice(detailDto.getMusicTheoryPrice());
+                    activityCourseDetailDto.setMusic_theory_price(detailDto.getMusic_theory_price());
                 }
             }else {
                 SysUser sysUser = sysUserFeignService.queryUserById(student.getUserId());
@@ -943,10 +943,10 @@ public class StudentManageServiceImpl implements StudentManageService {
                 if(degreeCourseFee == null){
                     throw new BizException("学员所在分部未配置考级价格");
                 }
-                activityCourseDetailDto.setMusicTheoryPrice(degreeCourseFee.getTheory());
+                activityCourseDetailDto.setMusic_theory_price(degreeCourseFee.getTheory());
             }
         }else {
-            activityCourseDetailDto.setMusicTheoryPrice(BigDecimal.ZERO);
+            activityCourseDetailDto.setMusic_theory_price(BigDecimal.ZERO);
         }
         activityCourseDetailDto.setUserId(null);
         student.setActivityCourseDetail(JSON.toJSONString(activityCourseDetailDto));

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

@@ -109,7 +109,7 @@
 		LEFT JOIN sys_user su ON ses.create_user_id_ = su.id_
 		LEFT JOIN `subject` s ON FIND_IN_SET(s.id_,ses.subject_ids_)
 		<include refid="queryPageSql"/>
-		GROUP BY ses.id_ ORDER BY ses.id_ DESC
+		GROUP BY ses.id_ ORDER BY ses.name_,ses.id_ DESC
 		<include refid="global.limit"/>
 	</select>