作业改版

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

@@ -4,6 +4,8 @@ package com.ym.mec.biz.dal.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  *
  * @author zx
@@ -36,7 +38,7 @@ public class LessonExaminationResultDto1 {
     private String avatar;
 
     @ApiModelProperty(value = "截止日期")
-    private String expireDate;
+    private Date expireDate;
 
     @ApiModelProperty(value = "是否截止")
     private Boolean expireFlag;

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

@@ -44,8 +44,8 @@ public class LessonExamination{
     private Integer teacherId;
 
     @TableField("expire_date_")
-    @ApiModelProperty(value = "截止日期(年月日)")
-    private String expireDate;
+    @ApiModelProperty(value = "截止日期")
+    private Date expireDate;
 
     @TableField("training_num_")
     @ApiModelProperty(value = "提交人数")

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

@@ -16,15 +16,14 @@ public class LessonExaminationQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "老师编号")
     private Integer teacherId;
 
-    @ApiModelProperty(value = "布置时间(年月日)")
+    @ApiModelProperty(value = "布置时间(年月)")
     private String startTime;
 
-    @ApiModelProperty(value = "布置时间（年月日）")
-    private String endTime;
-
     @ApiModelProperty(value = "班级类型")
-    private String classGroupType;
+    private Integer subjectId;
 
     @ApiModelProperty(value = "测验是否截止")
     private Boolean expireFlag;
+
+    private Long lessonExaminationId;
 }

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

@@ -73,7 +73,7 @@ public class LessonExaminationServiceImpl extends ServiceImpl<LessonExaminationD
         if(org.apache.commons.lang3.StringUtils.isEmpty(expireTime)){
             expireTime = "7";
         }
-        String expireDate = DateUtil.dateToString(DateUtil.addDays(new Date(), Integer.parseInt(expireTime)),DateUtil.ISO_EXPANDED_DATE_FORMAT);
+        Date expireDate = DateUtil.addDays(new Date(), Integer.parseInt(expireTime));
         LessonExamination lessonExamination = new LessonExamination();
         lessonExamination.setExpectNum(param.getExpectNum());
         if(param.getCourseScheduleId() != null){

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

@@ -108,8 +108,7 @@ public class StudentLessonExaminationServiceImpl extends ServiceImpl<StudentLess
             throw new BizException("训练内容不存在");
         }
         Date now = new Date();
-        Date expireDate = DateUtil.stringToDate(lessonExamination.getExpireDate(), DateUtil.DEFAULT_PATTERN);
-        if(DateUtil.daysBetween(now,expireDate) < 0){
+        if(now.after(lessonExamination.getExpireDate())){
             throw new BizException("训练已截止");
         }
         StudentLessonExamination studentLessonExamination = this.lambdaQuery().eq(StudentLessonExamination::getLessonExaminationId, lessonExaminationId)

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

@@ -42,6 +42,7 @@
     <select id="queryPage" resultType="com.ym.mec.biz.dal.dto.LessonExaminationResultDto">
         select le.*,cg.name_ classGroupName
         from lesson_examination le
+        left join student_lesson_examination sle ON sle.lesson_examination_id_ = le.id_
         left join class_group cg ON cg.id_ = le.class_group_id_
         <include refid="queryPageSql"/>
         GROUP BY le.id_ ORDER BY le.id_ DESC
@@ -50,11 +51,15 @@
     <select id="findCount" resultType="java.lang.Integer">
         select COUNT(DISTINCT le.id_)
         from lesson_examination le
+        left join student_lesson_examination sle ON sle.lesson_examination_id_ = le.id_
         left join class_group cg ON cg.id_ = le.class_group_id_
         <include refid="queryPageSql"/>
     </select>
     <sql id="queryPageSql">
         <where>
+            <if test="lessonExaminationId != null">
+                AND le.id_ = #{lessonExaminationId}
+            </if>
             <if test="musicGroupId != null and musicGroupId != ''">
                 AND le.music_group_id_ = #{musicGroupId}
             </if>
@@ -65,16 +70,16 @@
                 AND le.teacher_id_ = #{teacherId}
             </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="classGroupType != null and classGroupType != ''">
-                AND cg.type_ = #{classGroupType}
+            <if test="subjectId != null">
+                AND sle.subject_id_ = #{subjectId}
             </if>
             <if test="expireFlag != null and expireFlag == true">
-                AND le.expire_date_ &lt; DATE_FORMAT( NOW(), '%Y-%m-%d' )
+                AND le.expire_date_ &lt; NOW()
             </if>
             <if test="expireFlag != null and expireFlag == false">
-                AND le.expire_date_ >= DATE_FORMAT( NOW(), '%Y-%m-%d' )
+                AND le.expire_date_ >= NOW()
             </if>
         </where>
     </sql>
@@ -91,10 +96,10 @@
                 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' )
+                AND le.expire_date_ &lt; NOW()
             </if>
             <if test="expireFlag != null and expireFlag == false">
-                AND le.expire_date_ >= DATE_FORMAT( NOW(), '%Y-%m-%d' )
+                AND le.expire_date_ >= NOW()
             </if>
             <if test="standardFlag != null">
                 AND sle.standard_flag_ = #{standardFlag}
@@ -120,7 +125,7 @@
         <include refid="queryPageByStudentSql"/>
     </select>
     <select id="getOneByStudent" resultType="com.ym.mec.biz.dal.dto.LessonExaminationResultDto1">
-        select le.expire_date_ expireDate,CASE WHEN DATE_FORMAT( NOW(), '%Y-%m-%d' ) > le.expire_date_ THEN 1 ELSE 0 END expireFlag,
+        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_score_ trainingScore,sle.lesson_examination_id_ LessonExaminationId,sle.user_id_ userId
         from student_lesson_examination sle

mec-teacher/src/main/java/com/ym/mec/teacher/controller/LessonExaminationController.java

@@ -11,10 +11,7 @@ import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -49,5 +46,14 @@ public class LessonExaminationController extends BaseController {
         return succeed(lessonExaminationService.queryPage(queryInfo));
     }
 
+    @ApiOperation(value = "获取单个作业")
+    @GetMapping("getOne")
+    public HttpResponseResult<LessonExaminationResultDto> queryPage(Long lessonExaminationId) {
+        LessonExaminationQueryInfo queryInfo = new LessonExaminationQueryInfo();
+        queryInfo.setLessonExaminationId(lessonExaminationId);
+        LessonExaminationResultDto resultDto = lessonExaminationService.queryPage(queryInfo).getRows().get(0);
+        return succeed(resultDto);
+    }
+
 }