update

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

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.entity.CourseScheduleComplaints;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Collection;
 import java.util.List;
 
 public interface CourseScheduleComplaintsDao extends BaseDAO<Long, CourseScheduleComplaints> {
@@ -67,7 +68,7 @@ public interface CourseScheduleComplaintsDao extends BaseDAO<Long, CourseSchedul
      * 删除申述
      * @param courseScheduleIds
      */
-    void delByCourseScheduleIds(@Param("courseScheduleIds") List<Long> courseScheduleIds);
+    void delByCourseScheduleIds(@Param("courseScheduleIds") Collection<Long> courseScheduleIds);
 
     /**
      * 获取课程用户的评价

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

@@ -6,10 +6,7 @@ import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 public interface TeacherAttendanceDao extends BaseDAO<Long, TeacherAttendance> {
 
@@ -186,6 +183,18 @@ public interface TeacherAttendanceDao extends BaseDAO<Long, TeacherAttendance> {
     void batchUpdateTeacher(@Param("courseScheduleIds") Set<Long> courseScheduleIds, @Param("teacherId") Integer teacherId);
 
 	/**
+	 * 清除考勤申述
+	 * @param courseScheduleIds
+	 */
+    void clearAttendanceComplaints(@Param("courseScheduleIds") Collection<Long> courseScheduleIds);
+
+	/**
+	 * 清除考勤申述
+	 * @param courseScheduleId
+	 */
+    void clearAttendanceComplaint(@Param("courseScheduleId") Long courseScheduleId);
+
+	/**
 	 * @describe 根据团体删除班级
 	 * @author Joburgess
 	 * @date 2020/2/17
@@ -232,13 +241,6 @@ public interface TeacherAttendanceDao extends BaseDAO<Long, TeacherAttendance> {
 	int countTeacherAttendanceComplaints(Map<String, Object> params);
 
 	/**
-	 * 删除老师考勤
-	 * @param courseScheduleIds
-	 * @param teacherId
-	 */
-	void deleteByCourseAndTeacherId(@Param("courseScheduleIds") Set<Long> courseScheduleIds, @Param("teacherId") Integer teacherId);
-
-	/**
 	 * 获取上课时间
 	 * @param courseScheduleId
 	 * @return

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

@@ -2133,6 +2133,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		courseScheduleReviewDao.delByCourseScheduleIds(courseScheduleIds);
 		//删除申述
 		courseScheduleComplaintsDao.delByCourseScheduleIds(courseScheduleIds);
+		//清除考勤申述
+		teacherAttendanceDao.clearAttendanceComplaints(courseScheduleIds);
 //        vipGroupService.checkVipCourseIsInScore(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
 //        courseScheduleStudentPaymentService.updateVipGiveCourse(vipGroup.getId());
         if(scheduleModifyLogs.size() == courseSchedules.size()){
@@ -2754,6 +2756,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				}
 			}
 
+			//删除申述
+			courseScheduleComplaintsDao.delByCourseScheduleIds(courseScheduleIds);
+
 			// 调整日志
 			CourseScheduleModifyLog courseScheduleModifyLog = new CourseScheduleModifyLog();
 			courseScheduleModifyLog.setCourseScheduleId(courseScheduleId);
@@ -2896,6 +2901,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             if (newCourseSchedule.getStartClassTime().after(now)){
                 teacherAttendanceDao.cleanCourseTeacherSignInfo(newCourseSchedule.getId());
                 needCreateStudentPaymentCourses.add(oldCourseSchedule);
+                //删除申述
+                courseScheduleComplaintsDao.delByCourseScheduleId(newCourseSchedule.getId());
+                //清除考勤申述
+                teacherAttendanceDao.clearAttendanceComplaint(newCourseSchedule.getId());
             }
 
             boolean courseTimeIsChange = false;
@@ -2907,6 +2916,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
             if(newCourseSchedule.getStartClassTime().after(oldCourseSchedule.getStartClassTime())){
                 teacherAttendanceDao.cleanCourseTeacherSignInfo(newCourseSchedule.getId());
+                //删除申述
+                courseScheduleComplaintsDao.delByCourseScheduleId(newCourseSchedule.getId());
+                //清除考勤申述
+                teacherAttendanceDao.clearAttendanceComplaint(newCourseSchedule.getId());
             }
 
             oldCourseSchedule.setClassDate(newCourseSchedule.getClassDate());
@@ -3858,6 +3871,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		courseScheduleReviewDao.delByCourseScheduleId(courseScheduleId);
 		//删除申述
 		courseScheduleComplaintsDao.delByCourseScheduleId(courseScheduleId);
+		//清除考勤申述
+		teacherAttendanceDao.clearAttendanceComplaint(courseScheduleId);
         courseScheduleDao.update(oldCourseSchedule);
         courseScheduleModifyLogDao.insert(scheduleModifyLog);
 		if(practiceGroup.getType() == TRIAL){
@@ -3933,6 +3948,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			}
 		}
         teacherAttendanceDao.batchUpdateTeacher(courseScheduleIds,teacherId);
+		//删除申述
+		courseScheduleComplaintsDao.delByCourseScheduleId(courseScheduleId);
+		//删除申述
+		courseScheduleComplaintsDao.delByCourseScheduleIds(courseScheduleIds);
+		//清除考勤申述
+		teacherAttendanceDao.clearAttendanceComplaints(courseScheduleIds);
         courseScheduleModifyLogDao.insert(scheduleModifyLog);
 
         Map<Integer, String> map = new HashMap<>(2);
@@ -4045,6 +4066,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			}
 		}
         teacherAttendanceDao.batchUpdateTeacher(courseScheduleIds,teacherId);
+		//删除申述
+		courseScheduleComplaintsDao.delByCourseScheduleIds(courseScheduleIds);
+		//清除考勤申述
+		teacherAttendanceDao.clearAttendanceComplaints(courseScheduleIds);
         courseScheduleModifyLogDao.batchInsert(scheduleModifyLogs);
 
         if (teacherIdMap != null && teacherIdMap.size() > 0) {
@@ -4078,6 +4103,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		}
         teacherAttendanceDao.batchCleanCourseTeacherSignInfo(courseScheduleId);
         studentAttendanceDao.deleteByCourseSchedules(courseScheduleId);
+		//删除申述
+		courseScheduleComplaintsDao.delByCourseScheduleIds(courseScheduleId);
+		//清除考勤申述
+		teacherAttendanceDao.clearAttendanceComplaints(courseScheduleId);
         //重置学生人数
 		courseScheduleDao.resetStudentNum(courseScheduleId);
     }

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

@@ -577,6 +577,19 @@
         SET sign_out_status_ = NULL,sign_out_time_= NULL
     	WHERE course_schedule_id_=#{courseId}
     </update>
+    <update id="clearAttendanceComplaints">
+        UPDATE teacher_attendance
+        SET is_complaints_ = 0,complaints_status_ = NULL,complaints_content_ = NULL,dispose_content_ = NULL,operator_ = NULL,complaints_time_ = NULL
+        WHERE course_schedule_id_ IN
+        <foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
+            #{courseScheduleId}
+        </foreach>
+    </update>
+    <update id="clearAttendanceComplaint">
+        UPDATE teacher_attendance
+        SET is_complaints_ = 0,complaints_status_ = NULL,complaints_content_ = NULL,dispose_content_ = NULL,operator_ = NULL,complaints_time_ = NULL
+        WHERE course_schedule_id_ = #{courseScheduleId}
+    </update>
 
     <delete id="deleteByMusicGroupId" parameterType="map" >
 		DELETE ta FROM teacher_attendance ta LEFT JOIN course_schedule cs ON ta.course_schedule_id_ = cs.id_
@@ -589,10 +602,4 @@
     <delete id="deleteByGroup">
         DELETE FROM teacher_attendance WHERE music_group_id_=#{groupId} AND group_type_=#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
     </delete>
-    <delete id="deleteByCourseAndTeacherId">
-        DELETE FROM teacher_attendance WHERE teacher_id_ = #{teacherId} AND course_schedule_id_ IN
-        <foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
-            #{courseScheduleId}
-        </foreach>
-    </delete>
 </mapper>