异常修改

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

@@ -0,0 +1,63 @@
+package com.qmth.themis.business.dto.response;
+
+import com.qmth.themis.business.entity.TEConfig;
+import com.qmth.themis.business.entity.TEStudent;
+
+import java.io.Serializable;
+import java.util.List;
+
+/** 
+* @Description: 考试返回 
+* @Param:  
+* @return:  
+* @Author: wangliang
+* @Date: 2020/8/3 
+*/ 
+public class TEExamResultDto implements Serializable {
+
+    private TEExamDto waiting;
+    private List<TEExamActivityDto> activities;
+    private TEExamActivityDto activity;
+    private TEStudent student;
+    private TEConfig global;
+
+    public TEExamDto getWaiting() {
+        return waiting;
+    }
+
+    public void setWaiting(TEExamDto waiting) {
+        this.waiting = waiting;
+    }
+
+    public List<TEExamActivityDto> getActivities() {
+        return activities;
+    }
+
+    public void setActivities(List<TEExamActivityDto> activities) {
+        this.activities = activities;
+    }
+
+    public TEExamActivityDto getActivity() {
+        return activity;
+    }
+
+    public void setActivity(TEExamActivityDto activity) {
+        this.activity = activity;
+    }
+
+    public TEStudent getStudent() {
+        return student;
+    }
+
+    public void setStudent(TEStudent student) {
+        this.student = student;
+    }
+
+    public TEConfig getGlobal() {
+        return global;
+    }
+
+    public void setGlobal(TEConfig global) {
+        this.global = global;
+    }
+}

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

@@ -6,6 +6,7 @@ import com.qmth.themis.business.annotation.ApiJsonProperty;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.dto.AuthDto;
 import com.qmth.themis.business.dto.response.TEExamDto;
+import com.qmth.themis.business.dto.response.TEExamResultDto;
 import com.qmth.themis.business.dto.response.TEExamUnFinishDto;
 import com.qmth.themis.business.entity.TBSession;
 import com.qmth.themis.business.entity.TEConfig;
@@ -77,7 +78,7 @@ public class TEStudentController {
 
     @ApiOperation(value = "学生登录接口")
     @RequestMapping(value = "/login", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "学生信息", response = TEStudent.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "学生信息", response = TEExamResultDto.class)})
     public Result login(@ApiJsonObject(name = "loginAccount", value = {
             @ApiJsonProperty(key = "identity", description = "证件号"),
             @ApiJsonProperty(key = "password", description = "密码"),