update

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

@@ -154,9 +154,6 @@ public interface ClassGroupStudentMapperDao extends BaseDAO<Long, ClassGroupStud
     List<StudentAttendanceViewDto> findStudentByCourseWithPage(Map<String, Object> params);
     int countStudentByCourseWithPage(Map<String, Object> params);
 
-    List<CourseScheduleStudentPayment> queryAll(Map<String, Object> params);
-    int countAll(Map<String, Object> params);
-
     /**
      * 查找班级学生对应关系
      *

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

@@ -335,4 +335,7 @@ public interface CourseScheduleStudentPaymentDao extends BaseDAO<Long, CourseSch
      * @return java.util.List<java.util.Map<java.lang.Integer,java.util.Date>>
      */
     List<Map<Integer, Date>> findStudentLastCourseSchedule(@Param("studentIds") List<Integer> StudentIds);
+
+    List<CourseScheduleStudentPayment> queryAll(Map<String, Object> params);
+    int countAll(Map<String, Object> params);
 }

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

@@ -289,11 +289,11 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 		MapUtil.populateMap(params, queryInfo);
 
 		List<CourseScheduleStudentListDto> dataList = new ArrayList<>();
-		int count = classGroupStudentMapperDao.countAll(params);
+		int count = courseScheduleStudentPaymentDao.countAll(params);
 		if (count > 0) {
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());
-			List<CourseScheduleStudentPayment> courseScheduleStudentPayments = classGroupStudentMapperDao.queryAll(params);
+			List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentDao.queryAll(params);
 			Set<Integer> studentIds = courseScheduleStudentPayments.stream().map(CourseScheduleStudentPayment::getUserId).collect(Collectors.toSet());
 			List<StudentAttendance> studentAttendances = studentAttendanceDao.findByCourseId(queryInfo.getCourseScheduleId().longValue());
 			List<SimpleUserDto> usersSimpleInfo = teacherDao.getUsersSimpleInfo(new ArrayList<>(studentIds));

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

@@ -531,23 +531,4 @@
         ) t
         LEFT JOIN sys_user su ON t.educational_teacher_id_=su.id_
     </select>
-
-    <sql id="queryAllCondition">
-        <where>
-            <if test="courseScheduleId != null">
-                course_schedule_id_ = #{courseScheduleId}
-            </if>
-        </where>
-    </sql>
-
-    <select id="queryAll" resultMap="ClassGroupStudentMapper">
-        SELECT * FROM course_schedule_student_payment
-        <include refid="queryAllCondition" />
-        ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-    <select id="countAll" resultType="int">
-        SELECT COUNT(*) FROM course_schedule_student_payment
-        <include refid="queryAllCondition" />
-    </select>
 </mapper>

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

@@ -523,4 +523,23 @@
 			AND CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) < NOW( )
 		GROUP BY user_id_;
 	</select>
+
+	<sql id="queryAllCondition">
+		<where>
+			<if test="courseScheduleId != null">
+				course_schedule_id_ = #{courseScheduleId}
+			</if>
+		</where>
+	</sql>
+
+	<select id="queryAll" resultMap="CourseScheduleStudentPayment">
+		SELECT * FROM course_schedule_student_payment
+		<include refid="queryAllCondition" />
+		ORDER BY id_
+		<include refid="global.limit"/>
+	</select>
+	<select id="countAll" resultType="int">
+		SELECT COUNT(*) FROM course_schedule_student_payment
+		<include refid="queryAllCondition" />
+	</select>
 </mapper>

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

@@ -387,7 +387,7 @@
         </where>
     </select>
 
-    <select id="getUserSimpleInfo" resultType="com.ym.mec.biz.dal.dto.SimpleUserDto">
+    <select id="getUsersSimpleInfo" resultType="com.ym.mec.biz.dal.dto.SimpleUserDto">
         SELECT
             su.id_ userId,
             su.real_name_ userName,
@@ -402,6 +402,7 @@
             </if>
         </where>
     </select>
+
     <select id="findTeaTeachersByOrganAndSubject" resultMap="TeacherBasicDto">
         SELECT
             su.id_,