Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service.impl;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.ClassGroupTeachersDto;
 import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.dal.enums.CourseStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
 import com.ym.mec.biz.dal.enums.TeachTypeEnum;
@@ -49,6 +50,8 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
     private MusicGroupService musicGroupService;
     @Autowired
     private TeacherAttendanceDao teacherAttendanceDao;
+    @Autowired
+    private CourseScheduleDao courseScheduleDao;
 
     @Override
     public BaseDAO<Long, ClassGroupTeacherMapper> getDAO() {
@@ -58,6 +61,13 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int classGroupTeachersInsert(List<ClassGroupTeacherMapper> classGroupTeacherMapperList) {
+        String musicGroupId = classGroupTeacherMapperList.get(0).getMusicGroupId();
+
+        //删除老师未开始的课程
+        List<CourseSchedule> musicGroupCourseSchedules = courseScheduleDao.findMusicGroupCourseSchedules(musicGroupId, GroupType.MUSIC.getCode(), CourseStatusEnum.NOT_START.getCode());
+        if(musicGroupCourseSchedules != null && musicGroupCourseSchedules.size() >0){
+            courseScheduleService.batchDeleteMusicGroupNotStartCourse(musicGroupId,GroupType.MUSIC);
+        }
         //老师加入群组
         List<ImGroupMember> imGroupMemberList = new ArrayList<>();
         String classGroupIds = classGroupTeacherMapperList.stream().map(classGroupTeacherMapper -> classGroupTeacherMapper.getClassGroupId().toString()).collect(Collectors.joining(","));

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

@@ -37,7 +37,7 @@ import java.util.stream.Stream;
 
 @Service
 public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSchedule>  implements CourseScheduleService {
-	
+
 	@Autowired
 	private CourseScheduleDao courseScheduleDao;
 	@Autowired
@@ -1090,7 +1090,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		if(status == AuditStatusEnum.ING){
 			throw new BizException("审批状态不正确");
 		}
-		
+
 		CourseScheduleComplaints courseScheduleComplaints = courseScheduleComplaintsDao.get(id);
 		if (Objects.isNull(courseScheduleComplaints)) {
 			throw new BizException("投诉记录不存在");
@@ -1118,14 +1118,14 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		if (studentAttendanceList != null && studentAttendanceList.size() > 0) {
 			studentAttendanceDao.addStudentAttendances(studentAttendanceList);
 		}
-		
+
 		//自动更新课程状态至“已结束”
 		List<CourseSchedule> list = courseScheduleDao.queryFinishedWithNoUpdateStatus();
 
 		List<CourseSchedule> updateList = new ArrayList<CourseSchedule>();
 		List<Integer> classGroupIds = new ArrayList<Integer>();
 		List<Long> courseScheduleIdList = new ArrayList<Long>();
-		
+
 		for (CourseSchedule courseSchedule : list) {
 			courseSchedule.setStatus(CourseStatusEnum.OVER);
 			courseSchedule.setUpdateTime(date);
@@ -1134,7 +1134,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			if (!classGroupIds.contains(courseSchedule.getClassGroupId())) {
 				classGroupIds.add(courseSchedule.getClassGroupId());
 			}
-			
+
 			if(courseSchedule.getGroupType() == GroupType.VIP){
 				courseScheduleIdList.add(courseSchedule.getId());
 			}
@@ -1147,10 +1147,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		// 更新班级已上课次
 		if (classGroupIds.size() > 0) {
 			classGroupService.batchIncreaseClassTimes(classGroupIds);
-			
+
 			//查询班级信息
 			List<ClassGroup> classGroupList = classGroupService.findClassGroupByIds(classGroupIds.stream().map(e->e.toString()).collect(Collectors.joining(",")));
-			
+
 			List<String> vipGroupIdList = new ArrayList<String>();
 			for(ClassGroup classGroup : classGroupList){
 				if(classGroup.getGroupType() == GroupType.VIP && classGroup.getCurrentClassTimes() == classGroup.getTotalClassTimes().intValue()){
@@ -1168,12 +1168,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				vipGroupDao.batchUpdate(vipGroupList);
 			}
 		}
-		
+
 		if (courseScheduleIdList.size() > 0) {
 			// vip课自动签退
 			teacherAttendanceDao.updateViPSignOutStatus(courseScheduleIdList.stream().map(a -> a.toString()).collect(Collectors.joining(",")));
 		}
-		
+
 		return true;
 	}
 
@@ -1288,7 +1288,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			for(Mapper mapper : mapperList){
 				Map<Integer, String> receivers = new HashMap<Integer, String>();
 				receivers.put((Integer) mapper.getKey(), mapper.getKey() + "");
-				
+
 				sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_ATTEND_COURSE_MESSAGE, receivers, null, 0, "2", mapper.getValue());
 			}
 		}

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

@@ -194,6 +194,7 @@
         AND cgsm.user_id_=#{userId}
         AND cg.type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         AND FIND_IN_SET(cgsm.status_,'NORMAL,LEAVE')
+        AND cg.del_flag_='0'
     </select>
     <select id="findClassGroupIdByUserAndCourseDateAndStatus" resultType="int">
         SELECT