Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into saas

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

@@ -32,7 +32,7 @@
 		SELECT qur.* FROM questionnaire_user_result qur
 		LEFT JOIN sys_user su ON su.id_ = qur.user_id_
 		<where>
-			tenant_id_ = #{tenantId}
+            qur.tenant_id_ = #{tenantId}
 			<if test="userId != null">
 				AND qur.user_id_ = #{userId}
 			</if>

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherAttendanceController.java

@@ -112,16 +112,15 @@ public class TeacherAttendanceController extends BaseController {
         //教务推送
         if(Objects.nonNull(courseSchedule)&& GroupType.MUSIC.equals(courseSchedule.getGroupType())){
             MusicGroup musicGroup = musicGroupService.get(courseSchedule.getMusicGroupId());
-            if(Objects.isNull(musicGroup)||Objects.isNull(musicGroup.getTransactionTeacherId())){
-                return succeed();
+            if(!Objects.isNull(musicGroup) && !Objects.isNull(musicGroup.getTransactionTeacherId())){
+                int normalStudentNum = normal.size();
+                long leaveStudentNum = studentAttendances.stream().filter(studentAttendance -> studentAttendance.getStatus() == StudentAttendanceStatusEnum.LEAVE).count();
+                long truantStudentNum = studentAttendances.stream().filter(studentAttendance -> studentAttendance.getStatus() == StudentAttendanceStatusEnum.TRUANT).count();
+                Map<Integer, String> receivers = new HashMap<>();
+                receivers.put(musicGroup.getTransactionTeacherId(), musicGroup.getTransactionTeacherId().toString());
+                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SYSTEM_PUSH_NAMES_ACHIEVE,
+                        receivers, null, 0, null, "SYSTEM", courseSchedule.getName(), normalStudentNum, leaveStudentNum, truantStudentNum);
             }
-            int normalStudentNum = normal.size();
-            long leaveStudentNum = studentAttendances.stream().filter(studentAttendance -> studentAttendance.getStatus() == StudentAttendanceStatusEnum.LEAVE).count();
-            long truantStudentNum = studentAttendances.stream().filter(studentAttendance -> studentAttendance.getStatus() == StudentAttendanceStatusEnum.TRUANT).count();
-            Map<Integer, String> receivers = new HashMap<>();
-            receivers.put(musicGroup.getTransactionTeacherId(), musicGroup.getTransactionTeacherId().toString());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SYSTEM_PUSH_NAMES_ACHIEVE,
-                    receivers, null, 0, null, "SYSTEM", courseSchedule.getName(), normalStudentNum, leaveStudentNum, truantStudentNum);
         }
 
         if (normal != null && normal.size() > 0) {