候考未完成字段修改

themis-business/src/main/java/com/qmth/themis/business/bean/exam/ExamActivityUnFinishBean.java

@@ -2,8 +2,7 @@ package com.qmth.themis.business.bean.exam;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.themis.business.cache.bean.ExamCacheBean;
-import com.qmth.themis.business.dto.response.TEExamActivityDto;
+import com.qmth.themis.business.dto.response.TEExamActivityWaitDto;
 
 /**
  * @Description: 未完成的考试activity
@@ -12,7 +11,7 @@ import com.qmth.themis.business.dto.response.TEExamActivityDto;
  * @Author: wangliang
  * @Date: 2020/8/8
  */
-public class ExamActivityUnFinishBean extends TEExamActivityDto {
+public class ExamActivityUnFinishBean extends TEExamActivityWaitDto {
 
     @JsonSerialize(using = ToStringSerializer.class)
     private Long recordId;

themis-business/src/main/java/com/qmth/themis/business/bean/exam/ExamUnFinishBean.java

@@ -17,21 +17,15 @@ public class ExamUnFinishBean implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
     private String name;
-    private String preNotice;
-    private Integer preNoticeStaySeconds;
-    private String postNotice;
     private ExamActivityUnFinishBean activity;
 
     public ExamUnFinishBean() {
 
     }
 
-    public ExamUnFinishBean(Long id, String name, String preNotice, Integer preNoticeStaySeconds, String postNotice,ExamActivityUnFinishBean activity) {
+    public ExamUnFinishBean(Long id, String name, ExamActivityUnFinishBean activity) {
         this.id = id;
         this.name = name;
-        this.preNotice = preNotice;
-        this.preNoticeStaySeconds = preNoticeStaySeconds;
-        this.postNotice = postNotice;
         this.activity = activity;
     }
 
@@ -58,28 +52,4 @@ public class ExamUnFinishBean implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
-
-    public String getPreNotice() {
-        return preNotice;
-    }
-
-    public void setPreNotice(String preNotice) {
-        this.preNotice = preNotice;
-    }
-
-    public Integer getPreNoticeStaySeconds() {
-        return preNoticeStaySeconds;
-    }
-
-    public void setPreNoticeStaySeconds(Integer preNoticeStaySeconds) {
-        this.preNoticeStaySeconds = preNoticeStaySeconds;
-    }
-
-    public String getPostNotice() {
-        return postNotice;
-    }
-
-    public void setPostNotice(String postNotice) {
-        this.postNotice = postNotice;
-    }
 }

themis-business/src/main/java/com/qmth/themis/business/dao/TEExamActivityMapper.java

@@ -2,7 +2,6 @@ package com.qmth.themis.business.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.themis.business.dto.response.TEExamActivityDto;
 import com.qmth.themis.business.dto.response.TEExamActivityQueryDto;
 import com.qmth.themis.business.dto.response.TEExamActivityWaitDto;
 import com.qmth.themis.business.entity.TEExamActivity;
@@ -86,5 +85,5 @@ public interface TEExamActivityMapper extends BaseMapper<TEExamActivity> {
      */
     public List<TEExamActivityWaitDto> getWaitingExam(@Param("studentId") Long studentId, @Param("examActivityIds") Set<Long> examActivityIds, @Param("mode") String mode);
 
-	public List<TEExamActivity> findByExamIdAndOrgId(@Param("examId")Long examId,@Param("orgId") Long orgId);
+    public List<TEExamActivity> findByExamIdAndOrgId(@Param("examId") Long examId, @Param("orgId") Long orgId);
 }

themis-business/src/main/java/com/qmth/themis/business/dto/response/TEExamActivityWaitDto.java

@@ -31,8 +31,8 @@ public class TEExamActivityWaitDto implements Serializable {
     @ApiModelProperty(name = "考试场次id")
     private Long id;//考试id
 
-    @ApiModelProperty(name = "考试场次代码")
-    private String code;//考试场次代码
+//    @ApiModelProperty(name = "考试场次代码")
+//    private String code;//考试场次代码
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(name = "考生id")
@@ -145,7 +145,7 @@ public class TEExamActivityWaitDto implements Serializable {
     public TEExamActivityWaitDto(ExamCacheBean ec, ExamActivityCacheBean examActivityCacheBean, ExamStudentCacheBean examStudentCacheBean, Long examStudentId, ExamCourseCacheBean examCourseCacheBean,
                                  Long startTime, Long endTime, Integer openingSeconds, Integer minDurationSeconds, Integer maxDurationSeconds, Integer forceFinish) {
         this.id = examActivityCacheBean.getId();
-        this.code = examActivityCacheBean.getCode();
+//        this.code = examActivityCacheBean.getCode();
         this.examStudentId = examStudentId;
         this.courseCode = examStudentCacheBean.getCourseCode();
         this.courseName = examStudentCacheBean.getCourseName();
@@ -337,13 +337,13 @@ public class TEExamActivityWaitDto implements Serializable {
         this.id = id;
     }
 
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
+//    public String getCode() {
+//        return code;
+//    }
+//
+//    public void setCode(String code) {
+//        this.code = code;
+//    }
 
     public Long getExamStudentId() {
         return examStudentId;

themis-business/src/main/java/com/qmth/themis/business/dto/response/TEExamResultDto.java

@@ -17,13 +17,13 @@ import java.util.List;
 public class TEExamResultDto implements Serializable {
 
     @ApiModelProperty(name = "考试批次信息")
-    private TEExamDto waiting;
+    private TEExamWaitDto waiting;
 
     @ApiModelProperty(name = "考试场次信息集合")
-    private List<TEExamActivityDto> activities;
+    private List<TEExamActivityWaitDto> activities;
 
     @ApiModelProperty(name = "考试场次信息")
-    private TEExamActivityDto activity;
+    private TEExamActivityWaitDto activity;
 
     @ApiModelProperty(name = "学生信息")
     private TEStudent student;
@@ -31,27 +31,27 @@ public class TEExamResultDto implements Serializable {
     @ApiModelProperty(name = "全局配置信息")
     private TEConfig global;
 
-    public TEExamDto getWaiting() {
+    public TEExamWaitDto getWaiting() {
         return waiting;
     }
 
-    public void setWaiting(TEExamDto waiting) {
+    public void setWaiting(TEExamWaitDto waiting) {
         this.waiting = waiting;
     }
 
-    public List<TEExamActivityDto> getActivities() {
+    public List<TEExamActivityWaitDto> getActivities() {
         return activities;
     }
 
-    public void setActivities(List<TEExamActivityDto> activities) {
+    public void setActivities(List<TEExamActivityWaitDto> activities) {
         this.activities = activities;
     }
 
-    public TEExamActivityDto getActivity() {
+    public TEExamActivityWaitDto getActivity() {
         return activity;
     }
 
-    public void setActivity(TEExamActivityDto activity) {
+    public void setActivity(TEExamActivityWaitDto activity) {
         this.activity = activity;
     }
 

themis-business/src/main/java/com/qmth/themis/business/service/TEExamActivityService.java

@@ -3,7 +3,6 @@ package com.qmth.themis.business.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.themis.business.cache.bean.ExamActivityCacheBean;
-import com.qmth.themis.business.dto.response.TEExamActivityDto;
 import com.qmth.themis.business.dto.response.TEExamActivityQueryDto;
 import com.qmth.themis.business.dto.response.TEExamActivityWaitDto;
 import com.qmth.themis.business.entity.TEExamActivity;
@@ -107,5 +106,5 @@ public interface TEExamActivityService extends IService<TEExamActivity> {
      */
     void deleteExamActivityCacheBean(Long examActivityId);
 
-	public List<TEExamActivity> findByExamIdAndOrgId(Long examId, Long orgId);
+    public List<TEExamActivity> findByExamIdAndOrgId(Long examId, Long orgId);
 }

themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamActivityServiceImpl.java

@@ -1,25 +1,22 @@
 package com.qmth.themis.business.service.impl;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Resource;
-
-import com.qmth.themis.business.dto.response.TEExamActivityWaitDto;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.CachePut;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.themis.business.cache.bean.ExamActivityCacheBean;
 import com.qmth.themis.business.dao.TEExamActivityMapper;
-import com.qmth.themis.business.dto.response.TEExamActivityDto;
 import com.qmth.themis.business.dto.response.TEExamActivityQueryDto;
+import com.qmth.themis.business.dto.response.TEExamActivityWaitDto;
 import com.qmth.themis.business.entity.TEExamActivity;
 import com.qmth.themis.business.service.TEExamActivityService;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.CachePut;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * @Description: 考试场次 服务实现类
@@ -174,8 +171,8 @@ public class TEExamActivityServiceImpl extends ServiceImpl<TEExamActivityMapper,
         return ret;
     }
 
-	@Override
-	public List<TEExamActivity> findByExamIdAndOrgId(Long examId, Long orgId) {
-		return teExamActivityMapper.findByExamIdAndOrgId(examId,orgId);
-	}
+    @Override
+    public List<TEExamActivity> findByExamIdAndOrgId(Long examId, Long orgId) {
+        return teExamActivityMapper.findByExamIdAndOrgId(examId, orgId);
+    }
 }

themis-exam/src/main/java/com/qmth/themis/exam/api/TEStudentController.java

@@ -17,8 +17,7 @@ import com.qmth.themis.business.dto.AuthDto;
 import com.qmth.themis.business.dto.ExpireTimeDTO;
 import com.qmth.themis.business.dto.MqDto;
 import com.qmth.themis.business.dto.cache.TEStudentCacheDto;
-import com.qmth.themis.business.dto.response.TEExamActivityDto;
-import com.qmth.themis.business.dto.response.TEExamDto;
+import com.qmth.themis.business.dto.response.TEExamActivityWaitDto;
 import com.qmth.themis.business.dto.response.TEExamResultDto;
 import com.qmth.themis.business.dto.response.TEExamWaitDto;
 import com.qmth.themis.business.entity.TBOrg;
@@ -339,17 +338,16 @@ public class TEStudentController {
                                             ExamActivityCacheBean examActivityCacheBean, Long examStudentId) {
         ExamCourseCacheBean examCourseCacheBean = teExamCourseService
                 .getExamCourseCacheBean(ec.getId(), examStudentCacheBean.getCourseCode());
-        TEExamActivityDto teExamActivityDto = new TEExamActivityDto(ec, examActivityCacheBean, examStudentCacheBean,
+        TEExamActivityWaitDto teExamActivityWaitDto = new TEExamActivityWaitDto(ec, examActivityCacheBean, examStudentCacheBean,
                 examStudentId, examCourseCacheBean, ExamRecordCacheUtil.getStartTime(recordId),
                 ExamRecordCacheUtil.getEndTime(recordId), ExamRecordCacheUtil.getOpeningSeconds(recordId),
                 ExamRecordCacheUtil.getMinDurationSeconds(recordId),
                 ExamRecordCacheUtil.getMaxDurationSeconds(recordId), ExamRecordCacheUtil.getForceFinish(recordId));
         Gson gson = new Gson();
         ExamActivityUnFinishBean examActivityUnFinishBean = gson
-                .fromJson(gson.toJson(teExamActivityDto), ExamActivityUnFinishBean.class);
+                .fromJson(gson.toJson(teExamActivityWaitDto), ExamActivityUnFinishBean.class);
         examActivityUnFinishBean.setRecordId(recordId);
-        return new ExamUnFinishBean(ec.getId(), ec.getName(), ec.getPreNotice(), ec.getPreNoticeStaySeconds(),
-                ec.getPostNotice(), examActivityUnFinishBean);
+        return new ExamUnFinishBean(ec.getId(), ec.getName(), examActivityUnFinishBean);
     }
 
     /**