Browse Source

feat:无班级学员异常提醒

Joburgess 4 năm trước cách đây
mục cha
commit
9f1f1ed6dd

+ 20 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/NoClassMusicStudentDto.java

@@ -18,6 +18,26 @@ public class NoClassMusicStudentDto {
 
     private String studentName;
 
+    private Integer subjectId;
+
+    private String subjectName;
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
     public Integer getOrganId() {
         return organId;
     }

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

@@ -843,7 +843,7 @@
 		SELECT
 			'NO_CLASS_MUSIC_GROUP_STUDENT_INFO' errorType,
 			COUNT( DISTINCT sr.music_group_id_ ) num,
-			COUNT( DISTINCT sr.user_id_ ) num2
+			COUNT( sr.user_id_ ) num2
 		FROM
 			student_registration sr
 				LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_

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

@@ -845,6 +845,8 @@
         <result property="groupName" column="music_group_name_"/>
         <result property="studentId" column="student_id_"/>
         <result property="studentName" column="student_name_"/>
+        <result property="subjectId" column="subject_id_" />
+        <result property="subjectName" column="subject_name_" />
     </resultMap>
 
     <sql id="queryNoClassMusicStudentsCondition">
@@ -877,15 +879,18 @@
             sr.music_group_id_,
             mg.name_ music_group_name_,
             sr.user_id_ student_id_,
-            stu.username_ student_name_
+            stu.username_ student_name_,
+            sr.actual_subject_id_ subject_id_,
+            sub.name_ subject_name_
         FROM
             student_registration sr
-                LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
-                LEFT JOIN class_group_student_mapper cgsm ON cgsm.group_type_ = 'MUSIC'
-                    AND cgsm.music_group_id_ = sr.music_group_id_
-                    AND cgsm.user_id_ = sr.user_id_
-                LEFT JOIN sys_user stu ON stu.id_ = sr.user_id_
-                LEFT JOIN organization organ ON mg.organ_id_=organ.id_
+            LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
+            LEFT JOIN class_group_student_mapper cgsm ON cgsm.group_type_ = 'MUSIC'
+                AND cgsm.music_group_id_ = sr.music_group_id_
+                AND cgsm.user_id_ = sr.user_id_
+            LEFT JOIN sys_user stu ON stu.id_ = sr.user_id_
+            LEFT JOIN organization organ ON mg.organ_id_=organ.id_
+            LEFT JOIN `subject` sub ON sub.id_=sr.actual_subject_id_
         <include refid="queryNoClassMusicStudentsCondition" />
         ORDER BY mg.organ_id_,sr.user_id_
         <include refid="global.limit"></include>