Merge remote-tracking branch 'origin/master'

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;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/MessageTypeEnum.java

@@ -63,7 +63,8 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
 
     /**试听课*/
     TRIAL_PRACTICE_CREATE_STUDENT_PUSH("TRIAL_PRACTICE_CREATE_STUDENT_PUSH", "试听课安排"),
-    TRIAL_PRACTICE_CREATE_TEACHER_PUSH("TRIAL_PRACTICE_CREATE_TEACHER_PUSH", "试听课安排"),
+
+    PRACTICE_CREATE_TEACHER_PUSH("PRACTICE_CREATE_TEACHER_PUSH", "新增网管课程"),
 
     /**乐团网管课*/
     MUSIC_NETWORK_CRATE_TEACHER("MUSIC_NETWORK_CRATE_TEACHER", "乐团网管课安排"),

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

@@ -1485,14 +1485,12 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
 
             Map<Integer, String> teacherMap = new HashMap<>();
             teacherMap.put(practiceGroupBuyParams.getUserId(), practiceGroupBuyParams.getUserId().toString());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TRIAL_PRACTICE_CREATE_TEACHER_PUSH,
-                    teacherMap, null, 0, null, "TEACHER", teacher.getRealName(), practiceGroupBuyParams.getName(),
-                    oneCourseTimeStr, twoCourseTimeStr);
-//            Map<Integer, String> teacherPhoneMap = new HashMap<>();
-//            teacherPhoneMap.put(practiceGroupBuyParams.getUserId(), teacher.getPhone());
-//            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.TRIAL_PRACTICE_CREATE_TEACHER_PUSH,
-//                    teacherPhoneMap, null, 0, null, "TEACHER", teacher.getRealName(), practiceGroupBuyParams.getName(),
-//                    oneCourseTimeStr, twoCourseTimeStr);
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
+                    teacherMap, null, 0, null, "TEACHER", teacher.getRealName(), "试听课", practiceGroupBuyParams.getName());
+            Map<Integer, String> teacherPhoneMap = new HashMap<>();
+            teacherPhoneMap.put(practiceGroupBuyParams.getUserId(), teacher.getPhone());
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
+                    teacherPhoneMap, null, 0, null, "TEACHER", teacher.getRealName(), "试听课", practiceGroupBuyParams.getName());
         }catch (Exception e){
             e.printStackTrace();
         }

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

@@ -24,6 +24,9 @@ import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.page.NoClassMusicStudentQueryInfo;
 import com.ym.mec.biz.service.*;
+import com.ym.mec.common.page.QueryInfo;
+import com.ym.mec.im.WebFeignService;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.slf4j.Logger;

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_

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

@@ -858,6 +858,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">
@@ -890,17 +892,20 @@
             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_
+        ORDER BY sr.id_
         <include refid="global.limit"></include>
     </select>