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

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

@@ -190,7 +190,7 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
                         teacher.getRealName());
             } else {
 
-                String notifyUrl = "?courseScheduleID=" + studentExtraExercise.getId() + "&studentCourseHomeworkId=" + studentExtraExercise.getId() + "&extra=1";
+                String notifyUrl = "?courseScheduleID=" + extracurricularExercisesReply.getId() + "&studentCourseHomeworkId=" + extracurricularExercisesReply.getId() + "&extra=1";
                 String extra = "dayaedu" + notifyUrl + "&userId=" + studentId;
                 if (exercises.getMsgType() != ImSendTypeEnum.TXT) {
                     sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_REMIND_IM_DETAIL, exercises.getTeacherId().toString(), extra,

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

@@ -152,15 +152,18 @@ public class LessonExaminationServiceImpl extends ServiceImpl<LessonExaminationD
             Map<Integer, String> teacherNameMap = MapUtil.convertIntegerMap(teacherDao.queryNameByIdList(teacherIds));
             Set<Integer> organIds = dataList.stream().map(e -> e.getOrganId()).collect(Collectors.toSet());
             Map<Integer, String> organNameMap = MapUtil.convertIntegerMap(organizationDao.findOrganNameMapList(organIds));
-            StringBuffer sb;
             for (LessonExaminationResultDto vo : dataList) {
                 vo.setOrganName(organNameMap.get(vo.getOrganId()));
                 vo.setMusicGroupName(musicGroupNameMap.get(vo.getMusicGroupId()));
                 vo.setTeacherName(teacherNameMap.get(vo.getTeacherId()));
-                String userName = nameMap.get(vo.getId());
-                sb = new StringBuffer();
-                sb.append(userName).append("等").append(vo.getExpectNum()).append("名学员");
-                vo.setStudentNames(sb.toString());
+                if(vo.getExpectNum() > 1){
+                    StringBuffer sb = new StringBuffer(nameMap.get(vo.getId()));
+                    sb.append("等").append(vo.getExpectNum()).append("名学员");
+                    vo.setStudentNames(sb.toString());
+                }else {
+                    vo.setStudentNames(nameMap.get(vo.getId()));
+                }
+
             }
         }
         if (count == 0) {

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

@@ -409,7 +409,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
                         studentCourseHomework.setGroupType(teacherAttendance.getGroupType());
                     }
 
-                    if (CollectionUtils.isEmpty(studentLessonTrainingDetails)) {
+                    if (!CollectionUtils.isEmpty(studentLessonTrainingDetails)) {
                         versionTag ="v2";
                     }
 

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

@@ -104,6 +104,9 @@
 			<if test="expiryDate != null">
 				expiry_date_ = #{expiryDate},
 			</if>
+            <if test="versionTag != null">
+                version_tag_ = #{versionTag},
+            </if>
 			update_time_ = NOW()
 		</set>
 		WHERE id_ = #{id} and tenant_id_ = #{tenantId}