update

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysMusicScoreAccompaniment.java

@@ -2,7 +2,6 @@ package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.entity.SysMusicScore.PlayMode;
 import com.ym.mec.biz.dal.enums.ClientTypeEnum;
-
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -78,8 +77,6 @@ public class SysMusicScoreAccompaniment {
 	
 	private String renderFrom;
 	
-	private String playMode;
-	
 	private boolean enableEvaluation;
 	
 	private String museScoreUrl;
@@ -280,14 +277,6 @@ public class SysMusicScoreAccompaniment {
 		this.renderFrom = renderFrom;
 	}
 
-	public String getPlayMode() {
-		return playMode;
-	}
-
-	public void setPlayMode(String playMode) {
-		this.playMode = playMode;
-	}
-
 	public boolean isEnableEvaluation() {
 		return enableEvaluation;
 	}

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

@@ -1925,7 +1925,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         musicGroupQuit.setIsVisit(reqMusicGroupQuit.getIsVisit());
         musicGroupQuit.setVisitTime(reqMusicGroupQuit.getVisitTime());
         musicGroupQuit.setStatus(PROCESSING);
-        musicGroupQuit.setCurrentApproveRole(SysUserRoleEnum.EDUCATION + "");
+        //加一的原因是为了和positionId同步，枚举是从0开始
+        musicGroupQuit.setCurrentApproveRole(SysUserRoleEnum.EDUCATION.ordinal() + 1 + "");
 
         if (currentOperatorRoleIds != null && currentOperatorRoleIds.size() > 0) {
             if (!currentOperatorRoleIds.contains(SysUserRoleEnum.ORGAN_MANAGER) && currentOperatorRoleIds.contains(SysUserRoleEnum.EDUCATION)) {
@@ -1933,7 +1934,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 if (musicGroupQuit.getStatus() == ApprovalStatus.APPROVED) {
                     throw new BizException("只能分部经理操作退团");
                 }
-                musicGroupQuit.setCurrentApproveRole(SysUserRoleEnum.ORGAN_MANAGER.ordinal() + "");
+                //加一的原因是为了和positionId同步，枚举是从0开始
+                musicGroupQuit.setCurrentApproveRole(SysUserRoleEnum.ORGAN_MANAGER.ordinal() + 1 + "");
             }
             if (currentOperatorRoleIds.contains(SysUserRoleEnum.ORGAN_MANAGER) && !currentOperatorRoleIds.contains(SysUserRoleEnum.EDUCATION)) {
 
@@ -2126,7 +2128,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (status != ApprovalStatus.PROCESSING) {
             courseScheduleStudentPaymentService.updateCourseActualPrice(Arrays.asList(musicGroupId), Arrays.asList(userId), GroupType.MUSIC);
         } else {
-            musicGroupQuit.setCurrentApproveRole(ORGAN_MANAGER.ordinal() + "");
+            //加一的原因是为了和positionId同步，枚举是从0开始
+            musicGroupQuit.setCurrentApproveRole(ORGAN_MANAGER.ordinal() + 1 + "");
         }
         musicGroupQuitDao.update(musicGroupQuit);
 

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

@@ -31,7 +31,6 @@
 		<result column="memo_" property="memo" />
 		<result column="rank_ids_" property="rankIds" />
 		<result column="render_from_" property="renderFrom" />
-		<result column="play_mode_" property="playMode" />
 		<result column="enable_evaluation_" property="enableEvaluation" />
 		<result column="client_type_" property="clientType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="play_mode_" property="playMode" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />