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

mec-biz/src/main/java/com/ym/mec/biz/service/CloudTeacherFreeCourseService.java

@@ -3,7 +3,6 @@ package com.ym.mec.biz.service;
 import com.ym.mec.biz.dal.dao.CloudTeacherFreeCourseDao;
 import com.ym.mec.biz.dal.entity.CloudTeacherFreeCourse;
 import com.ym.mec.common.service.BaseService;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 

mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleConvertService.java

@@ -1,6 +1,5 @@
 package com.ym.mec.biz.service;
 
-import com.ym.mec.biz.dal.dto.CourseConvertDto;
 import com.ym.mec.biz.dal.entity.ClassGroupDto;
 import com.ym.mec.common.entity.HttpResponseResult;
 

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

@@ -2,11 +2,9 @@ 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.dao.OperatingReportCloudDao;
 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.biz.service.OperatingReportCloudService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import org.apache.commons.lang3.StringUtils;

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

@@ -24,6 +24,9 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
+	<select id="get" resultMap="CourseConvertLog">
+		SELECT * FROM course_convert_log WHERE id_ = #{id}
+	</select>
 	<update id="updateRevoke">
 		update course_convert_log set revoke_flag_ = 1,update_time_ = NOW() where id_ = #{courseConvertId}
 	</update>

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

@@ -13,10 +13,11 @@
         AND FIND_IN_SET(cs.id_,#{courseIds})
     </select>
     <select id="checkStudentCourseNum" resultType="java.lang.Integer">
-        select COUNT(cssp.id_) from course_schedule_student_payment cssp
-        where cssp.user_id_ NOT IN (select distinct cssp.user_id_ from course_schedule_student_payment cssp
-        where FIND_IN_SET(cssp.course_schedule_id_,#{courseIds}))
-        and FIND_IN_SET(cssp.course_schedule_id_,#{courseIds})
+        select COUNT(DISTINCT cssp.course_schedule_id_) from course_schedule_student_payment cssp
+        where FIND_IN_SET(cssp.course_schedule_id_,#{courseIds})
+        GROUP BY cssp.course_schedule_id_ HAVING COUNT(DISTINCT cssp.user_id_) &lt; (select COUNT(distinct cssp.user_id_) num_
+        from course_schedule_student_payment cssp
+        where FIND_IN_SET(cssp.course_schedule_id_,#{courseIds}));
     </select>
     <resultMap id="CourseConvertSumDto" type="com.ym.mec.biz.dal.dto.CourseConvertSumDto">
         <result property="courseType" column="courseType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>