课程转换

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

@@ -13,7 +13,6 @@ import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
-import com.ym.mec.common.tenant.TenantContextHolder;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.Date;
@@ -430,12 +429,6 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	List<CourseSchedule> findNoStartCoursesByClassGroupId(Integer classGroupId);
 
 	/**
-	 * 学生有课提醒
-	 * @return
-	 */
-	void studentCoursesScheduleRemind();
-
-	/**
 	 * 学生上课提醒
 	 */
 	void studentSignInRemind();

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

@@ -238,6 +238,7 @@ public class CourseScheduleConvertServiceImpl implements CourseScheduleConvertSe
         if(CollectionUtils.isEmpty(studentPayments)){
             throw new BizException("操作失败：没有可操作的学员");
         }
+        //课程里面增加学员不允许还原、减少可以
         long count = studentPayments.stream().map(e -> e.getCreateTime()).distinct().count();
         if(count > 1){
             throw new BizException("操作失败：课程学员有变更");

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

@@ -4334,20 +4334,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 
     @Override
-    public void studentCoursesScheduleRemind() {
-        List<Mapper> mapperList = courseScheduleDao.queryStudentCoursesTimesOfTomorrow();
-        for (Mapper mapper : mapperList) {
-            Integer userId = Integer.parseInt(mapper.getKey().toString());
-            Integer size = Integer.parseInt(mapper.getValue().toString());
-
-            Map<Integer, String> receivers = new HashMap<Integer, String>();
-            receivers.put(userId, userId + "");
-
-            sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_HAVE_COURSE_MESSAGE, receivers, null, 0, "2","STUDENT", size);
-        }
-    }
-
-    @Override
     public void studentSignInRemind() {
         List<Mapper> mapperList = courseScheduleDao.queryStudentNotStartCourseScheduleIn90Mins();
         if (mapperList != null && mapperList.size() > 0) {

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

@@ -328,7 +328,7 @@
         FROM
             class_group_student_mapper cgsm
             LEFT JOIN course_schedule cs ON cgsm.class_group_id_=cs.class_group_id_
-            WHERE cgsm.user_id_=#{userId}
+            WHERE cgsm.user_id_=#{userId} AND cs.del_flag_ = 0
             AND cs.class_date_ = DATE_FORMAT(#{data},'%Y-%m-%d')
             AND cgsm.status_=#{status}
     </select>
@@ -466,7 +466,7 @@
     <select id="queryNewStudentListByCourseScheduleId" resultMap="ClassGroupStudentMapper">
       	SELECT cgsm.* FROM class_group_student_mapper cgsm LEFT JOIN course_schedule cs ON cgsm.class_group_id_= cs.class_group_id_
 		LEFT JOIN course_schedule_student_payment cssp on cssp.course_schedule_id_ = cs.id_ and cssp.user_id_ = cgsm.user_id_
-		WHERE cssp.id_ IS NULL AND cgsm.status_ != 'QUIT' and cs.id_ = #{courseScheduleId}
+		WHERE cssp.id_ IS NULL AND cgsm.status_ != 'QUIT' and cs.id_ = #{courseScheduleId} AND cs.del_flag_ = 0
     </select>
     <select id="findByGroups" resultMap="ClassGroupStudentMapper">
       SELECT

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

@@ -117,7 +117,7 @@
 		FROM
 			course_schedule cs
 		LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
-		WHERE cs.id_=#{courseScheduleID}
+		WHERE cs.id_=#{courseScheduleID}  AND cs.del_flag_ = 0
 	</select>
 
 </mapper>

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

@@ -1676,13 +1676,13 @@
     <!-- 查找班级未开始的课程 -->
     <select id="findCoursesByClassGroupId" resultMap="CourseSchedule">
         SELECT * FROM course_schedule
-        WHERE class_group_id_ = #{classGroupId} and (new_course_id_ is null or new_course_id_ = 0)
+        WHERE class_group_id_ = #{classGroupId} AND del_flag_ = 0 and (new_course_id_ is null or new_course_id_ = 0)
         <if test="status != null">
             and status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>
         union all
         select * from course_schedule
-        where class_group_id_ = #{classGroupId} AND pre_course_flag_ = 0 AND id_ = new_course_id_
+        where class_group_id_ = #{classGroupId} AND del_flag_ = 0 AND pre_course_flag_ = 0 AND id_ = new_course_id_
         <if test="status != null">
             and status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>