作业改版

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

@@ -23,6 +23,9 @@ public class StudentLessonExaminationDto {
     @ApiModelProperty(value = "最后评测时间")
     private Date trainingTime;
 
+    @ApiModelProperty(value = "是否评测")
+    private Boolean trainingFlag;
+
     @ApiModelProperty(value = "测评分数")
     private Integer trainingScore;
 

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

@@ -39,6 +39,10 @@ public class StudentLessonExamination {
     @ApiModelProperty(value = "最后测评时间")
     private Date trainingTime;
 
+    @TableField("training_flag_")
+    @ApiModelProperty(value = "是否测评")
+    private Boolean trainingFlag;
+
     @TableField("subject_id_")
     @ApiModelProperty(value = "声部")
     private Integer subjectId;

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

@@ -117,6 +117,7 @@ public class StudentLessonExaminationServiceImpl extends ServiceImpl<StudentLess
             //训练人数加一
             lessonExaminationDao.updateTrainingNum(lessonExaminationId);
         }
+        studentLessonExamination.setTrainingFlag(true);
         studentLessonExamination.setTrainingTime(now);
         this.updateById(studentLessonExamination);
         //是否达标

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

@@ -110,7 +110,7 @@
     <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
+        su.real_name_ teacherName,su.avatar_ avatar,sle.training_flag_ trainingFlag
         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_
@@ -126,7 +126,7 @@
     </select>
     <select id="getOneByStudent" resultType="com.ym.mec.biz.dal.dto.LessonExaminationResultDto1">
         select le.expire_date_ expireDate,CASE WHEN NOW() > le.expire_date_ THEN 1 ELSE 0 END expireFlag,
-                cg.name_ classGroupName,mg.name_ musicGroupName,
+                cg.name_ classGroupName,mg.name_ musicGroupName,sle.training_flag_ trainingFlag,
                sle.training_score_ trainingScore,sle.lesson_examination_id_ LessonExaminationId,sle.user_id_ userId
         from student_lesson_examination sle
                  left join lesson_examination le ON sle.lesson_examination_id_ = le.id_

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

@@ -7,7 +7,7 @@
         <result column="lesson_examination_id_" property="lessonExaminationId"/>
         <result column="training_score_" property="trainingScore"/>
         <result column="training_time_" property="trainingTime"/>
-        <result column="training_time_" property="trainingTime"/>
+        <result column="training_flag_" property="trainingFlag"/>
         <result column="subject_id_" property="subjectId"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
@@ -52,7 +52,7 @@
     </sql>
     <select id="queryPage" resultType="com.ym.mec.biz.dal.dto.StudentLessonExaminationDto">
         select su.avatar_ avatar,su.username_ username,sle.training_time_ trainingTime,sle.training_score_ trainingScore,
-               CASE WHEN s.membership_end_time_ > NOW() THEN 1 ELSE 0 END memberFlag,
+               CASE WHEN s.membership_end_time_ > NOW() THEN 1 ELSE 0 END memberFlag,sle.training_flag_ trainingFlag,
                sle.user_id_ userId,sle.lesson_examination_id_ lessonExaminationId,sb.name_ subjectName
         from student_lesson_examination sle
         left join student s ON s.user_id_ = sle.user_id_