update

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

@@ -56,4 +56,16 @@ public interface CourseScheduleComplaintsDao extends BaseDAO<Long, CourseSchedul
      * @return
      */
     List<CourseScheduleComplaints> findComplaintsByCourseScheduleIds(@Param("ids") List<Long> ids);
+
+    /**
+     * 删除申述
+     * @param courseScheduleId
+     */
+    void delByCourseScheduleId(@Param("courseScheduleId") Long courseScheduleId);
+
+    /**
+     * 删除申述
+     * @param courseScheduleIds
+     */
+    void delByCourseScheduleIds(@Param("courseScheduleIds") List<Long> courseScheduleIds);
 }

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.CourseReviewDto;
+import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.CourseScheduleReview;
 import com.ym.mec.biz.dal.entity.TeacherDefaultVipGroupSalary;
 import com.ym.mec.common.dal.BaseDAO;
@@ -101,4 +102,16 @@ public interface CourseScheduleReviewDao extends BaseDAO<Integer, CourseSchedule
      * @return
      */
     List<SysUser> findStudentByClassGroupId(@Param("classGroupId") Long classGroupId);
+
+    /**
+     * 删除课程评价
+     * @param courseScheduleId
+     */
+    void delByCourseScheduleId(@Param("courseScheduleId") Long courseScheduleId);
+
+    /**
+     * 删除课程评价
+     * @param courseScheduleIds
+     */
+    void delByCourseScheduleIds(@Param("courseScheduleIds") List<Long> courseScheduleIds);
 }

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

@@ -115,7 +115,6 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
 		// 删除学生作业
 		studentCourseHomeworkDao.delByCourseScheduleId(courseScheduleId);
 		// 删除学生回复的作业
-
 		return true;
 	}
 

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

@@ -30,7 +30,6 @@ import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.json.JsonUtil;
 import feign.codec.DecodeException;
-import io.swagger.models.auth.In;
 import org.apache.commons.collections.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -662,6 +661,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 		// 删除作业
 		courseHomeworkService.delHomwworkByCourseScheduleId(courseScheduleIds);
+		//删除评论
+		courseScheduleReviewDao.delByCourseScheduleIds(courseScheduleIds);
+		//删除申述
+		courseScheduleComplaintsDao.delByCourseScheduleIds(courseScheduleIds);
 
 		Date endDate = null;
 		Date startDate = null;
@@ -2046,6 +2049,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         if(vipGroupCourseAdjustInfo.getCourseCreateStartTime().after(now)){
             teacherAttendanceDao.batchCleanCourseTeacherSignInfo(courseScheduleIds);
         }
+		// 删除作业
+		courseHomeworkService.delHomwworkByCourseScheduleId(courseScheduleIds);
+		//删除评论
+		courseScheduleReviewDao.delByCourseScheduleIds(courseScheduleIds);
+		//删除申述
+		courseScheduleComplaintsDao.delByCourseScheduleIds(courseScheduleIds);
 //        vipGroupService.checkVipCourseIsInScore(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
 //        courseScheduleStudentPaymentService.updateVipGiveCourse(vipGroup.getId());
         if(scheduleModifyLogs.size() == courseSchedules.size()){
@@ -3748,18 +3757,16 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             //清空学生签到记录
             studentAttendanceDao.deleteStudentAttendancesByCourse(courseScheduleId);
         }
+		// 删除作业
+		courseHomeworkService.delHomwworkByCourseScheduleId(courseScheduleId);
+        //删除评论
+		courseScheduleReviewDao.delByCourseScheduleId(courseScheduleId);
+		//删除申述
+		courseScheduleComplaintsDao.delByCourseScheduleId(courseScheduleId);
         courseScheduleDao.update(oldCourseSchedule);
         courseScheduleModifyLogDao.insert(scheduleModifyLog);
     }
 
-	/**
-	 * 课程调整后清除课程相关信息
-	 */
-	@Transactional(rollbackFor = Exception.class)
-    private void cleanCourseMapper(){
-
-	}
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void practiceCourseTeacherAdjust(Long courseScheduleId,Integer teacherId) {

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

@@ -85,7 +85,16 @@
 	<delete id="delete" >
 		DELETE FROM course_schedule_complaints WHERE id_ = #{id} 
 	</delete>
-	
+    <delete id="delByCourseScheduleId">
+		DELETE FROM course_schedule_complaints WHERE course_schedule_id_ = #{courseScheduleId}
+	</delete>
+	<delete id="delByCourseScheduleIds">
+		DELETE FROM course_schedule_complaints WHERE course_schedule_id_ IN
+		<foreach collection="courseScheduleIds" item="id" open="(" close=")" separator=",">
+			#{id}
+		</foreach>
+	</delete>
+
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="CourseScheduleComplaints" parameterType="map">
 		SELECT * FROM course_schedule_complaints WHERE score_ &lt;= 2 ORDER BY id_ <include refid="global.limit"/>

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

@@ -39,6 +39,15 @@
         from course_schedule_review
         where id_ = #{id,jdbcType=INTEGER}
     </delete>
+    <delete id="delByCourseScheduleId">
+        DELETE FROM course_schedule_review WHERE course_schedule_id_ = #{courseScheduleId}
+    </delete>
+    <delete id="delByCourseScheduleIds">
+        DELETE FROM course_schedule_review WHERE course_schedule_id_ IN
+        <foreach collection="courseScheduleIds" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
     <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.CourseScheduleReview"
             useGeneratedKeys="true">
         <!--@mbg.generated-->

mec-common/common-core/src/main/java/com/ym/mec/common/filters/TenantIdThreadLocal.java

@@ -4,7 +4,6 @@ public class TenantIdThreadLocal {
     private static final ThreadLocal<Integer> threadLocal = new ThreadLocal<Integer>() {
         @Override
         protected Integer initialValue() {
-            System.out.println("调用get方法时，当前线程共享变量没有设置，调用initialValue获取默认值！");
             return null;
         }
     };

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherCourseScheduleController.java

@@ -53,10 +53,6 @@ public class TeacherCourseScheduleController extends BaseController {
     private SysUserFeignService sysUserFeignService;
     @Autowired
     private SysConfigService sysConfigService;
-    
-    @Autowired
-    private VipGroupService vipGroupService;
-    
     @Autowired
     private StudentAttendanceDao studentAttendanceDao;
     @Autowired

mec-teacher/src/main/java/com/ym/mec/teacher/interceptor/MDCInterceptor.java

@@ -2,6 +2,8 @@ package com.ym.mec.teacher.interceptor;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.TeacherDao;
+import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.common.filters.TenantIdThreadLocal;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -15,6 +17,8 @@ import javax.servlet.http.HttpServletResponse;
 public class MDCInterceptor extends HandlerInterceptorAdapter {
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
+	@Autowired
+	private TeacherDao teacherDao;
 	@Value("${auth.sysconfig.tenantId}")
 	private Integer tenantClientId;
 
@@ -22,10 +26,13 @@ public class MDCInterceptor extends HandlerInterceptorAdapter {
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if(sysUser != null){
-			if (sysUser.getOrganId() == tenantClientId) {
-				TenantIdThreadLocal.set(2);
-			}else {
-				TenantIdThreadLocal.set(1);
+			Teacher teacher = teacherDao.get(sysUser.getId());
+			if(teacher != null){
+				if (teacher.getTeacherOrganId() == tenantClientId) {
+					TenantIdThreadLocal.set(2);
+				}else {
+					TenantIdThreadLocal.set(1);
+				}
 			}
 		}
 		return true;