Merge branch 'zx_2022-11-22' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentErrorLeaveDto.java

@@ -20,6 +20,16 @@ public class StudentErrorLeaveDto {
 
     private String eduName;
 
+    private Integer courseNum;
+
+    public Integer getCourseNum() {
+        return courseNum;
+    }
+
+    public void setCourseNum(Integer courseNum) {
+        this.courseNum = courseNum;
+    }
+
     public String getMusicGroupName() {
         return musicGroupName;
     }

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

@@ -1816,11 +1816,12 @@
 		<result property="phone" column="phone_"/>
 		<result property="organId" column="organ_id_"/>
 		<result property="organName" column="organ_name_"/>
+		<result property="courseNum" column="course_num_"/>
 	</resultMap>
 	<select id="queryStudentErrorLeave" resultMap="StudentErrorLeaveDto">
-		SELECT organ_id_,organ_name_,user_id_,username_,phone_,current_num_,class_date_
+		SELECT organ_id_,organ_name_,user_id_,username_,phone_,current_num_,class_date_,course_num_
 		FROM (SELECT cs.organ_id_,o.name_ organ_name_,sa.user_id_,su.username_,su.phone_,
-		COUNT(sa.id_) current_num_,cs.class_date_
+		COUNT(sa.id_) current_num_,cs.class_date_,COUNT(DISTINCT sa.course_schedule_id_) course_num_
 		FROM student_attendance sa
 		LEFT JOIN course_schedule cs ON cs.id_ = sa.course_schedule_id_
 		LEFT JOIN organization o ON o.id_ = cs.organ_id_

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

@@ -1800,7 +1800,7 @@
         </foreach>
         GROUP BY sr.user_id_)
     </select>
-    <select id="getLastMusicGroupName" resultType="java.util.Map">
+    <select id="getLastEducationName" resultType="java.util.Map">
         SELECT sr.user_id_ 'key',su.real_name_ 'value' FROM student_registration sr
         LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
         left join sys_user su ON su.id_ = mg.educational_teacher_id_