更新代码

src/main/java/org/rcisoft/business/blesson/controller/BLessonController.java

@@ -691,7 +691,7 @@ public class BLessonController extends PaginationController<BLesson> {
      * @return
      * @author: zhangqingle
      */
-    @ApiOperation(value = "640 用户管理 - 课程情况 ", notes = "用户管理 - 课程情况 ")
+    @ApiOperation(value = "640 用户管理 - 课程情况 ", notes = "用户管理 - 课程情况 " )
     @GetMapping(value = "/userManageLessonByPagination")
     public Result userManageLessonByPagination(CurUser curUser, @Valid UserLessonDTO userLessonDTO, BindingResult bindingResult) {
         bLessonService.userManageLessonByPagination(getPaginationUtility(), userLessonDTO);
@@ -702,10 +702,9 @@ public class BLessonController extends PaginationController<BLesson> {
                 gridModel);
     }
 
-    @ApiOperation(value = "641 用户管理 - 考试情况 ", notes = "用户管理 - 考试情况 ")
+    @ApiOperation(value = "641 用户管理 - 考试情况 ", notes = "用户管理 - 考试情况 " ,response = ExamDto.class)
     @GetMapping(value = "/userManageExamByPagination")
     public Result userManageExamByPagination(CurUser curUser, @Valid ExamQueryDto dto, BindingResult bindingResult) {
-        //原型不完整---查询条件不明确
         bLessonService.userManageExamByPagination(getPaginationUtility(), dto);
         GridModel gridModel = getGridModelResponse();
         return Result.builder(new PersistModel(1),

src/main/java/org/rcisoft/business/blesson/dto/ExamDto.java

 package org.rcisoft.business.blesson.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
 
 @Data
 public class ExamDto {
+    @ApiModelProperty(value = "试卷名称")
     public String paperName;
+
+    @ApiModelProperty(value = "考试时长")
     public String examTime;
+
+    @ApiModelProperty(value = "及格分数/卷面分数")
     public String paperScore;
+
+    @ApiModelProperty(value = "考试状态")
     public String paperStatus;
+
+    @ApiModelProperty(value = "考试结果")
     public String examResult;
+
+    @ApiModelProperty(value = "试卷得分")
     public String score;
+
+    @ApiModelProperty(value = "考试耗时")
     public String timeCost;
+
+    @ApiModelProperty(value = "开考时间")
     public Date examStart;
+
+    @ApiModelProperty(value = "交卷时间")
     public Date examEnd;
+
     public Date PaperEndTime;
 
 }

src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java

@@ -1308,15 +1308,15 @@ public class BLessonServiceImpl implements BLessonService {
             for(ExamDto examDto : list){
                 //考试状态 0待参加 1已完成 2已失效 3进行中
                 if(examDto.getPaperStatus() == null && examDto.getPaperEndTime().after(new Date())){
-                    examDto.setPaperStatus("0");
+                    examDto.setPaperStatus("待参加");
                     examDto.setExamResult(null);
                 }else if(examDto.getPaperStatus() == null && examDto.getPaperEndTime().before(new Date())) {
-                    examDto.setPaperStatus("2");
+                    examDto.setPaperStatus("已失效");
                     examDto.setExamResult(null);
                 }else if("1".equals(examDto.getPaperStatus()) || "2".equals(examDto.getPaperStatus())){
-                    examDto.setPaperStatus("1");
+                    examDto.setPaperStatus("已完成");
                 }else if("0".equals(examDto.getPaperStatus())){
-                    examDto.setPaperStatus("3");
+                    examDto.setPaperStatus("进行中");
                     examDto.setScore(null);
                     examDto.setExamResult(null);
                 }