考试系统插件提交

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/controller/student/DashboardController.java

@@ -10,14 +10,16 @@ import vip.xiaonuo.exam.base.RestResponse;
 import vip.xiaonuo.exam.domain.TaskExam;
 import vip.xiaonuo.exam.domain.TaskExamCustomerAnswer;
 import vip.xiaonuo.exam.domain.TextContent;
+import vip.xiaonuo.exam.domain.enums.ExamPaperTypeEnum;
 import vip.xiaonuo.exam.domain.task.TaskItemAnswerObject;
 import vip.xiaonuo.exam.domain.task.TaskItemObject;
 import vip.xiaonuo.exam.service.*;
+import vip.xiaonuo.exam.utility.DateTimeUtil;
 import vip.xiaonuo.exam.utility.JsonUtil;
-import vip.xiaonuo.exam.viewmodel.student.dashboard.TaskItemPaperVm;
-import vip.xiaonuo.exam.viewmodel.student.dashboard.TaskItemVm;
+import vip.xiaonuo.exam.viewmodel.student.dashboard.*;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -41,31 +43,31 @@ public class DashboardController extends BaseApiController {
         this.textContentService = textContentService;
     }
 
-//    @RequestMapping(value = "/index", method = RequestMethod.POST)
-//    public RestResponse<IndexVM> index() {
-//        IndexVM indexVM = new IndexVM();
-//        User user = getCurrentUser();
-//
-//        PaperFilter fixedPaperFilter = new PaperFilter();
-//        fixedPaperFilter.setGradeLevel(user.getUserLevel());
-//        fixedPaperFilter.setExamPaperType(ExamPaperTypeEnum.Fixed.getCode());
-//        indexVM.setFixedPaper(examPaperService.indexPaper(fixedPaperFilter));
-//
-//        PaperFilter timeLimitPaperFilter = new PaperFilter();
-//        timeLimitPaperFilter.setDateTime(new Date());
-//        timeLimitPaperFilter.setGradeLevel(user.getUserLevel());
-//        timeLimitPaperFilter.setExamPaperType(ExamPaperTypeEnum.TimeLimit.getCode());
-//
-//        List<PaperInfo> limitPaper = examPaperService.indexPaper(timeLimitPaperFilter);
-//        List<PaperInfoVM> paperInfoVMS = limitPaper.stream().map(d -> {
-//            PaperInfoVM vm = modelMapper.map(d, PaperInfoVM.class);
-//            vm.setStartTime(DateTimeUtil.dateFormat(d.getLimitStartTime()));
-//            vm.setEndTime(DateTimeUtil.dateFormat(d.getLimitEndTime()));
-//            return vm;
-//        }).collect(Collectors.toList());
-//        indexVM.setTimeLimitPaper(paperInfoVMS);
-//        return RestResponse.ok(indexVM);
-//    }
+    @RequestMapping(value = "/index", method = RequestMethod.POST)
+    public RestResponse<IndexVM> index() {
+        IndexVM indexVM = new IndexVM();
+        SaBaseLoginUser user = getCurrentUser();
+
+        PaperFilter fixedPaperFilter = new PaperFilter();
+        fixedPaperFilter.setGradeLevel(user.getSortCode());
+        fixedPaperFilter.setExamPaperType(ExamPaperTypeEnum.Fixed.getCode());
+        indexVM.setFixedPaper(examPaperService.indexPaper(fixedPaperFilter));
+
+        PaperFilter timeLimitPaperFilter = new PaperFilter();
+        timeLimitPaperFilter.setDateTime(new Date());
+        timeLimitPaperFilter.setGradeLevel(user.getSortCode());
+        timeLimitPaperFilter.setExamPaperType(ExamPaperTypeEnum.TimeLimit.getCode());
+
+        List<PaperInfo> limitPaper = examPaperService.indexPaper(timeLimitPaperFilter);
+        List<PaperInfoVM> paperInfoVMS = limitPaper.stream().map(d -> {
+            PaperInfoVM vm = modelMapper.map(d, PaperInfoVM.class);
+            vm.setStartTime(DateTimeUtil.dateFormat(d.getLimitStartTime()));
+            vm.setEndTime(DateTimeUtil.dateFormat(d.getLimitEndTime()));
+            return vm;
+        }).collect(Collectors.toList());
+        indexVM.setTimeLimitPaper(paperInfoVMS);
+        return RestResponse.ok(indexVM);
+    }
 
 
     @RequestMapping(value = "/task", method = RequestMethod.POST)