Merge remote-tracking branch 'origin/master'

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

@@ -1281,6 +1281,16 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		List<Long> calenderIds = new ArrayList<Long>();
 		calenderIds.add(id);
 		musicGroupPaymentCalenderCourseSettingsDao.deleteByMusicGroupPaymentCalenderId(calenderIds);
+		
+		//如果乐团是“费用审核”，则需要修改状态
+		MusicGroup musicGroup = musicGroupDao.get(calender.getMusicGroupId());
+		if(musicGroup != null){
+			if(musicGroup.getStatus() == MusicGroupStatusEnum.FEE_AUDIT){
+				musicGroup.setStatus(MusicGroupStatusEnum.DRAFT);
+				musicGroup.setUpdateTime(new Date());
+				musicGroupDao.update(musicGroup);
+			}
+		}
 	}
 
 	@Override