update

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

@@ -27,7 +27,7 @@ public class VipGroupActivity {
 	private java.util.Date endTime;
 	
 	/**  */
-	private Integer organId;
+	private String organId;
 	
 	/**  */
 	private java.util.Date coursesStartTime;
@@ -130,11 +130,11 @@ public class VipGroupActivity {
 		return this.endTime;
 	}
 			
-	public void setOrganId(Integer organId){
+	public void setOrganId(String organId){
 		this.organId = organId;
 	}
 	
-	public Integer getOrganId(){
+	public String getOrganId(){
 		return this.organId;
 	}
 			

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

@@ -118,6 +118,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 	private SysConfigDao sysConfigDao;
 	
 	@Autowired
+	private ClassGroupService classGroupService;
+	
+	@Autowired
     private StudentPaymentOrderDetailDao studentPaymentOrderDetailDao;
 
     @Override
@@ -264,6 +267,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             throw new Exception("采购清单未确认");
         }
         //课酬是否确认
+        if(classGroupService.checkSetSalary(musicGroupId) == false){
+        	throw new Exception("课酬未确认");
+        }
 //        courseScheduleTeacherSalaryDao.queryCount();
         //记录操作日志
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"确认开团(筹备中 -> 进行中)",sysUser.getId(),""));