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

@@ -38,6 +38,9 @@ public class LessonExaminationResultDto1 {
     @ApiModelProperty(value = "截止日期")
     private String expireDate;
 
+    @ApiModelProperty(value = "是否截止")
+    private Boolean expireFlag;
+
     @ApiModelProperty(value = "测评分数")
     private Integer trainingScore;
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/LessonExaminationQueryInfo1.java

@@ -10,12 +10,9 @@ public class LessonExaminationQueryInfo1 extends QueryInfo {
     @ApiModelProperty(value = "学员编号")
     private Integer studentId;
 
-    @ApiModelProperty(value = "布置时间(年月日)")
+    @ApiModelProperty(value = "布置时间(年月)")
     private String startTime;
 
-    @ApiModelProperty(value = "布置时间（年月日）")
-    private String endTime;
-
     @ApiModelProperty(value = "测验是否截止")
     private Boolean expireFlag;
 

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

@@ -143,6 +143,9 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
                     studentExtraExercise.setMusicScoreContent(JSONObject.toJSONString(musicScoreSubjectDto.getMusicScoreHomeworkDtoList()));
                     extracurricularExercisesReplies.add(JSON.parseObject(JSON.toJSONString(studentExtraExercise),ExtracurricularExercisesReply.class));
                 }
+                if (CollectionUtils.isEmpty(musicScoreSubjectDto.getStudentLessonTrainingDetails())) {
+                    continue;
+                }
                 for (StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail studentLessonTrainingDetail : musicScoreSubjectDto.getStudentLessonTrainingDetails()) {
                     studentLessonTrainingDetail.setSubjectId(musicScoreSubjectDto.getSubjectId());
                 }

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

@@ -372,6 +372,9 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
                                              StringUtils.join(scoreSubjectDto.getMusicScoreIdList(),","),
                                              JSONObject.toJSONString(scoreSubjectDto.getMusicScoreHomeworkDtoList()),
                                              userIdList));
+                            if (CollectionUtils.isEmpty(scoreSubjectDto.getStudentLessonTrainingDetails())) {
+                                continue;
+                            }
 
                             for (StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail studentLessonTrainingDetail : scoreSubjectDto.getStudentLessonTrainingDetails()) {
                                 studentLessonTrainingDetail.setSubjectId(scoreSubjectDto.getSubjectId());

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

@@ -88,7 +88,7 @@
                 AND sle.user_id_ = #{studentId}
             </if>
             <if test="startTime != null and startTime != ''">
-                AND DATE_FORMAT( le.create_time_, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+                AND DATE_FORMAT( le.create_time_, '%Y-%m' ) = #{startTime}
             </if>
             <if test="expireFlag != null and expireFlag == true">
                 AND le.expire_date_ &lt; DATE_FORMAT( NOW(), '%Y-%m-%d' )
@@ -120,7 +120,8 @@
         <include refid="queryPageByStudentSql"/>
     </select>
     <select id="getOneByStudent" resultType="com.ym.mec.biz.dal.dto.LessonExaminationResultDto1">
-        select le.expire_date_ expireDate,cg.name_ classGroupName,mg.name_ musicGroupName,
+        select le.expire_date_ expireDate,CASE WHEN DATE_FORMAT( NOW(), '%Y-%m-%d' ) > le.expire_date_ THEN 1 ELSE 0 END expireFlag,
+                cg.name_ classGroupName,mg.name_ musicGroupName,
                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_