Merge branch 'zx_course_convert' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CloudTeacherFreeCourseDao.java

@@ -11,4 +11,6 @@ public interface CloudTeacherFreeCourseDao extends BaseDAO<Long, CloudTeacherFre
     void batchInsert(@Param("scheduleIdList") String scheduleIdList, @Param("calenderId") Long calenderId);
 
     void deleteByCourseIds(@Param("courseIdList") List<Long> courseIdList);
+
+    Integer countByCourseIdList(@Param("courseIdList") List<Long> courseIdList);
 }

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

@@ -1,9 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.CloudTeacherFreeCourseDao;
-import com.ym.mec.biz.dal.dao.CourseScheduleDao;
 import com.ym.mec.biz.dal.entity.CloudTeacherFreeCourse;
-import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.service.CloudTeacherFreeCourseService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
@@ -19,8 +17,6 @@ public class CloudTeacherFreeCourseServiceImpl extends BaseServiceImpl<Long, Clo
 	
 	@Autowired
 	private CloudTeacherFreeCourseDao cloudTeacherFreeCourseDao;
-	@Autowired
-	private CourseScheduleDao courseScheduleDao;
 
 	@Override
 	public BaseDAO<Long, CloudTeacherFreeCourse> getDAO() {
@@ -41,9 +37,7 @@ public class CloudTeacherFreeCourseServiceImpl extends BaseServiceImpl<Long, Clo
     @Override
 	@Transactional(rollbackFor = Exception.class)
     public void courseConvert(List<Long> oldCourseIdList,List<Long> courseIdList) {
-		List<CourseSchedule> courseSchedules = courseScheduleDao.findByCourseScheduleIds(oldCourseIdList);
-		boolean convertFlag = courseSchedules.get(0).getConvertFlag();
-		if(convertFlag){
+		if(cloudTeacherFreeCourseDao.countByCourseIdList(oldCourseIdList) > 0){
 			cloudTeacherFreeCourseDao.batchInsert(StringUtils.join(courseIdList,","),null);
 		}
     }

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

@@ -74,4 +74,10 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM cloud_teacher_free_course
 	</select>
+	<select id="countByCourseIdList" resultType="java.lang.Integer">
+		SELECT COUNT(0) FROM cloud_teacher_free_course WHERE course_id_ IN
+		<foreach collection="courseIdList" open="(" close=")" item="id" separator=",">
+			#{id}
+		</foreach>
+	</select>
 </mapper>