Merge remote-tracking branch 'origin/master'

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

@@ -320,4 +320,11 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 	 * @return
 	 */
 	List<ExportTeacherSalaryDto> exportVipTeacherSalary(Map<String, Object> params);
+
+	/**
+	 * 获取未结算的课程
+	 * @param courseScheduleIds
+	 * @return
+	 */
+	List<Long> querySettlementScheduleId(String courseScheduleIds);
 }

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

@@ -14,6 +14,7 @@ import org.apache.ibatis.annotations.Select;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public interface StudentAttendanceDao extends BaseDAO<Long, StudentAttendance> {
 
@@ -258,9 +259,4 @@ public interface StudentAttendanceDao extends BaseDAO<Long, StudentAttendance> {
     int deleteByGroup(@Param("groupId") String groupId,
                       @Param("groupType")GroupType groupType);
 
-    /**
-     * 清空学生考勤
-     * @param courseScheduleIds
-     */
-    void batchCleanCourseStudentSign(String courseScheduleIds);
 }

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

@@ -184,9 +184,4 @@ public interface TeacherAttendanceDao extends BaseDAO<Long, TeacherAttendance> {
 	int deleteByGroup(@Param("groupId") String groupId,
 					  @Param("groupType")GroupType groupType);
 
-	/**
-	 * 清楚老师考勤
-	 * @param courseScheduleIds
-	 */
-    void batchCleanCourseTeacherSign(String courseScheduleIds);
 }

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

@@ -13,6 +13,7 @@ import com.ym.mec.common.service.BaseService;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Set;
 
 public interface CourseScheduleTeacherSalaryService extends BaseService<Long, CourseScheduleTeacherSalary> {
 
@@ -80,4 +81,11 @@ public interface CourseScheduleTeacherSalaryService extends BaseService<Long, Co
      * @return
      */
     PageInfo<ExportTeacherSalaryDto> exportTeacherSalary(ExportTeacherSalaryQueryInfo queryInfo);
+
+    /**
+     * 获取未结算的编号
+     * @param courseScheduleIds
+     * @return
+     */
+    List<Long> querySettlementScheduleId(String courseScheduleIds);
 }

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

@@ -3140,7 +3140,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             throw new BizException("参数校验失败");
         }
         LOGGER.info("清空老师和学生考勤,user:{},参数:{}",user.getId(),courseScheduleIds);
-        teacherAttendanceDao.batchCleanCourseTeacherSign(courseScheduleIds);
-        studentAttendanceDao.batchCleanCourseStudentSign(courseScheduleIds);
+        List<Long> courseScheduleId = courseScheduleTeacherSalaryService.querySettlementScheduleId(courseScheduleIds);
+        if(courseScheduleId != null && courseScheduleId.size() > 0){
+            teacherAttendanceDao.batchCleanCourseTeacherSignInfo(courseScheduleId);
+            studentAttendanceDao.deleteByCourseSchedules(courseScheduleId);
+        }
     }
 }

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

@@ -707,4 +707,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         //陪练课
         return null;
     }
+
+    @Override
+    public List<Long> querySettlementScheduleId(String courseScheduleIds) {
+        return courseScheduleTeacherSalaryDao.querySettlementScheduleId(courseScheduleIds);
+    }
 }

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

@@ -567,4 +567,8 @@
 		WHERE cs.class_date_ BETWEEN #{firstDayOfMonth} AND #{lastDayOfMonth} AND cs.`del_flag_` != 1 AND cs.group_type_ = 'VIP'
 		GROUP BY ts.course_schedule_id_,ts.`user_id_`
 	</select>
+	<select id="querySettlementScheduleId" resultType="java.lang.Long">
+		SELECT DISTINCT csts.course_schedule_id_ FROM course_schedule_teacher_salary csts
+		WHERE csts.settlement_time_ IS NULL AND FIND_IN_SET(csts.course_schedule_id_,#{courseScheduleIds})
+	</select>
 </mapper>

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

@@ -172,9 +172,6 @@
     <delete id="deleteByGroup">
         DELETE FROM student_attendance WHERE music_group_id_=#{groupId} AND group_type_=#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
     </delete>
-    <delete id="batchCleanCourseStudentSign">
-        DELETE FROM student_attendance WHERE FIND_IN_SET(course_schedule_id_,#{courseScheduleIds})
-    </delete>
 
     <resultMap id="studentAttendanceViewUtilEntity" type="com.ym.mec.biz.dal.dto.StudentAttendanceViewDto">
         <result property="classGroupId" column="class_group_id_"/>

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

@@ -376,11 +376,6 @@
             #{courseScheduleId}
         </foreach>
     </update>
-    <update id="batchCleanCourseTeacherSign">
-        UPDATE teacher_attendance
-        SET sign_in_time_ = NULL,sign_in_status_=NULL,sign_out_status_ = NULL,sign_out_time_= NULL
-        WHERE FIND_IN_SET(course_schedule_id_,#{courseScheduleIds})
-    </update>
 
     <delete id="deleteByMusicGroupId" parameterType="map" >
 		DELETE ta FROM teacher_attendance ta LEFT JOIN course_schedule cs ON ta.course_schedule_id_ = cs.id_