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

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

@@ -4,6 +4,7 @@ package com.ym.mec.biz.dal.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -29,6 +30,9 @@ public class StudentLessonExaminationDto1 {
     @ApiModelProperty(value = "声部")
     private String subjectName;
 
+    @ApiModelProperty(value = "训练时间")
+    private Date trainingTime;
+
     private List<StudentLessonExaminationDetailDto1> detailDtos;
 }
 

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

@@ -22,22 +22,11 @@ public class TeacherSignOutDto {
     @ApiModelProperty(value = "学员学习是否达标")
     private List<StudentStandardDto> studentStandardDtos;
 
-    @ApiModelProperty(value = "课后评测信息")
-    private LessonExaminationSaveDto lessonExaminationSaveDto;
-
     /**
      * 是否返回错误信息
      */
     private boolean notRturnErrorInfo;
 
-    public LessonExaminationSaveDto getLessonExaminationSaveDto() {
-        return lessonExaminationSaveDto;
-    }
-
-    public void setLessonExaminationSaveDto(LessonExaminationSaveDto lessonExaminationSaveDto) {
-        this.lessonExaminationSaveDto = lessonExaminationSaveDto;
-    }
-
     public List<StudentStandardDto> getStudentStandardDtos() {
         return studentStandardDtos;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseHomework.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.dto.LessonExaminationSaveDto;
 import com.ym.mec.biz.dal.dto.MusicScoreSubjectDto;
 
 import com.ym.mec.biz.dal.dto.StudentLessonTrainingDetailWrapper;
@@ -70,7 +71,18 @@ public class CourseHomework extends BaseEntity {
     @ApiModelProperty("新版作业 time:2023-03-31")
     private List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> studentLessonTrainingDetails;
 
-    public List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> getStudentLessonTrainingDetails() {
+	@ApiModelProperty(value = "课后评测信息")
+	private LessonExaminationSaveDto lessonExaminationSaveDto;
+
+	public LessonExaminationSaveDto getLessonExaminationSaveDto() {
+		return lessonExaminationSaveDto;
+	}
+
+	public void setLessonExaminationSaveDto(LessonExaminationSaveDto lessonExaminationSaveDto) {
+		this.lessonExaminationSaveDto = lessonExaminationSaveDto;
+	}
+
+	public List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> getStudentLessonTrainingDetails() {
         return studentLessonTrainingDetails;
     }
 

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

@@ -452,7 +452,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			}
 
 			//布置课后评测
-			LessonExaminationSaveDto examinationSaveDto = teacherSignOutDto.getLessonExaminationSaveDto();
+			LessonExaminationSaveDto examinationSaveDto = teacherSignOutDto.getCourseHomeworkInfo().getLessonExaminationSaveDto();
 			if(Objects.nonNull(examinationSaveDto)){
 				lessonExaminationService.publish(examinationSaveDto);
 			}

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

@@ -73,6 +73,7 @@
         <result property="phone" column="phone_"/>
         <result property="username" column="username_"/>
         <result property="trainingScore" column="training_score_"/>
+        <result property="trainingTime" column="training_time_"/>
         <collection property="detailDtos" ofType="com.ym.mec.biz.dal.dto.StudentLessonExaminationDetailDto1">
             <result property="standardScore" column="standard_score_"/>
             <result property="trainingScore" column="training_score_"/>
@@ -84,7 +85,8 @@
     </resultMap>
     <select id="queryStudentPage" resultMap="StudentLessonExaminationDtoMap">
         select sle.user_id_,su.username_,su.phone_,sb.name_ subjectName,sle.training_score_,
-               sms.name_ musicScoreName,sled.actual_avg_score_,sled.standard_score_,sled.training_score_,sled.avg_score_,sled.heard_level_
+               sms.name_ musicScoreName,sled.actual_avg_score_,sled.standard_score_,sled.training_score_,
+               sled.avg_score_,sled.heard_level_,sle.training_time_
         from student_lesson_examination sle
         left join student_lesson_examination_detail sled ON sled.lesson_examination_id_ = sle.lesson_examination_id_ AND sled.user_id_ = sle.user_id_
         left join sys_music_score sms ON sms.id_ = sled.music_score_id_