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

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

@@ -40,6 +40,9 @@ public class LessonExaminationResultDto1 {
     @ApiModelProperty(value = "截止日期")
     private Date expireDate;
 
+    @ApiModelProperty(value = "训练提交时间")
+    private Date trainingTime;
+
     @ApiModelProperty(value = "是否达标")
     private Boolean standardFlag;
 

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

@@ -116,15 +116,14 @@ public class LessonExaminationServiceImpl extends ServiceImpl<LessonExaminationD
         studentExtracurricularExercisesSituationService.updateNum(lessonExamination,studentIds);
         //消息推送
         String teacherName = teacherDao.queryNameById(param.getTeacherId());
-        Map<Integer, String> userMap = new HashMap<>(1);
-        userMap.put(param.getTeacherId(), param.getTeacherId().toString());
         String notifyUrl = "evaluating?evaluateId=" + lessonExamination.getId();
         String extra = "dayaedu" + notifyUrl + "&type=evaluating&evaluateId=" + lessonExamination.getId();
         String[] strings = studentIds.stream().map(e->e.toString()).toArray(String[]::new);
+        Map<Integer, String> userMap = studentIds.stream().collect(Collectors.toMap(e -> e, v -> v.toString()));
         sysMessageService.batchSendImMessage(MessageTypeEnum.IM_PUBLISH_LESSON_EXAMINATION,param.getTeacherId().toString(), extra,
                 strings,null, teacherName);
         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_PUBLISH_LESSON_EXAMINATION,
-                userMap, null, 0, 3 + notifyUrl, "STUDENT", teacherName);
+                userMap, null, 0, notifyUrl, "STUDENT", teacherName);
     }
 
     @Override

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

@@ -110,7 +110,8 @@
     <select id="queryPageByStudent" resultType="com.ym.mec.biz.dal.dto.LessonExaminationResultDto1">
         select le.expire_date_ expireDate,cg.name_ classGroupName,le.music_group_id_ musicGroupId,
                sle.training_score_ trainingScore,sle.lesson_examination_id_ LessonExaminationId,sle.user_id_ userId,
-        su.real_name_ teacherName,su.avatar_ avatar,sle.training_flag_ trainingFlag,sle.standard_flag_ standardFlag,le.class_group_id_ classGroupId
+        su.real_name_ teacherName,su.avatar_ avatar,sle.training_flag_ trainingFlag,sle.standard_flag_ standardFlag,
+        le.class_group_id_ classGroupId,sle.training_time_ trainingTime
         from student_lesson_examination sle
         left join lesson_examination le ON sle.lesson_examination_id_ = le.id_
         left join class_group cg ON cg.id_ = le.class_group_id_
@@ -128,7 +129,7 @@
         select le.expire_date_ expireDate,CASE WHEN NOW() > le.expire_date_ THEN 1 ELSE 0 END expireFlag,
                 cg.name_ classGroupName,mg.name_ musicGroupName,sle.training_flag_ trainingFlag,
                sle.training_score_ trainingScore,sle.lesson_examination_id_ LessonExaminationId,sle.user_id_ userId,
-            su.real_name_ teacherName,su.avatar_ avatar,le.class_group_id_ classGroupId
+            su.real_name_ teacherName,su.avatar_ avatar,le.class_group_id_ classGroupId,sle.training_time_ trainingTime
         from student_lesson_examination sle
                  left join lesson_examination le ON sle.lesson_examination_id_ = le.id_
                  left join class_group cg ON cg.id_ = le.class_group_id_