Merge remote-tracking branch 'origin/master'

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

@@ -122,4 +122,11 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
      * @return java.util.List<java.util.Map<java.lang.Integer,java.lang.String>>
      */
     List<Map<Integer,String>> findSubjectNameCourseMaps(@Param("courseScheduleIds") List<Long> courseScheuleIds);
+
+    /**
+     * 获取声部名称
+     * @param subjectIdList
+     * @return
+     */
+    String findNames(String subjectIdList);
 }

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

@@ -248,8 +248,9 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 				//获取所有当前课程的学生列表
 				Map<Integer,String> userMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(courseScheduleDao.findStudentMap(courseScheduleId))),HashMap.class);
 				if(userMap != null && userMap.size() > 0){
+					String name = subjectDao.findNames(classGroup.getSubjectIdList());
 					sysMessageService.batchSendMessage(MessageSender.JIGUANG,MessageTypeEnum.STUDENT_PUSH_ONLINE_COURSE_ACTION,userMap,
-							null,0,"6?sealClassId=" + courseScheduleId + "&subjectName=" ,courseSchedule.getName());
+							null,0,"6?sealClassId=" + courseScheduleId + "&subjectName=" + name ,courseSchedule.getName());
 				}
 			}
 		}

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

@@ -333,7 +333,9 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 			rows.forEach(e->{
 //				e.setSubjectName(subjectDao.findBySubIds(e.getSubjectId()));
 //				e.setOrganName(organNames.get(e.getOrganId()));
-				e.setSubjectName(Arrays.asList(e.getSplitSubjectName().split(",")));
+				if(StringUtils.isNotEmpty(e.getSplitSubjectName())){
+					e.setSubjectName(Arrays.asList(e.getSplitSubjectName().split(",")));
+				}
 				Integer num = vipNumMap.get(e.getId());
 				e.setVipNum(num == null?0:num);
 				Integer demoNum = demoNumMap.get(e.getId());

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

@@ -246,7 +246,7 @@
         LEFT JOIN demo_group_class_group_mapper dgcgm ON dg.id_=dgcgm.demo_group_id_
         LEFT JOIN class_group cg ON dgcgm.class_group_id_=cg.id_
         LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
-        LEFT JOIN `subject` s ON s.id_ = dg.subject_id_
+        LEFT JOIN `subject` s ON s.id_ = cg.subject_id_list_
         WHERE cs.type_ = 'DEMO' AND dg.user_id_ = #{teacherId}
         GROUP BY cs.class_date_
         <include refid="global.limit"/>

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

@@ -182,4 +182,7 @@
             AND cg.subject_id_list_ IS NOT NULL
         GROUP BY cs.id_
     </select>
+    <select id="findNames" resultType="java.lang.String">
+        SELECT GROUP_CONCAT(DISTINCT s.name_) FROM `subject` s WHERE FIND_IN_SET(s.id_,#{subjectIdList})
+    </select>
 </mapper>