From 528b1892d8e929b199dddc96f3a43f9b8039c8c8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 06 六月 2024 18:00:42 +0800
Subject: [PATCH] 模板接口打通

---
 src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java |  199 ++++++++++++++++++++++++-------------------------
 1 files changed, 98 insertions(+), 101 deletions(-)

diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java
index bc25e2c..41d8df1 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java
@@ -1,6 +1,8 @@
 package com.ycl.jxkg.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ycl.jxkg.domain.*;
+import com.ycl.jxkg.domain.entity.*;
 import com.ycl.jxkg.domain.enums.ExamPaperAnswerStatusEnum;
 import com.ycl.jxkg.domain.enums.ExamPaperTypeEnum;
 import com.ycl.jxkg.domain.enums.QuestionTypeEnum;
@@ -8,22 +10,23 @@
 import com.ycl.jxkg.domain.other.KeyValue;
 import com.ycl.jxkg.domain.other.ExamPaperAnswerUpdate;
 import com.ycl.jxkg.domain.task.TaskItemAnswerObject;
-import com.ycl.jxkg.repository.ExamPaperAnswerMapper;
-import com.ycl.jxkg.repository.ExamPaperMapper;
-import com.ycl.jxkg.repository.QuestionMapper;
-import com.ycl.jxkg.repository.TaskExamCustomerAnswerMapper;
+import com.ycl.jxkg.mapper.ExamPaperAnswerMapper;
+import com.ycl.jxkg.mapper.ExamPaperMapper;
+import com.ycl.jxkg.mapper.QuestionMapper;
+import com.ycl.jxkg.mapper.TaskExamCustomerAnswerMapper;
 import com.ycl.jxkg.service.ExamPaperAnswerService;
 import com.ycl.jxkg.service.ExamPaperQuestionCustomerAnswerService;
 import com.ycl.jxkg.service.TextContentService;
-import com.ycl.jxkg.utility.DateTimeUtil;
-import com.ycl.jxkg.utility.ExamUtil;
-import com.ycl.jxkg.utility.JsonUtil;
-import com.ycl.jxkg.viewmodel.student.exam.ExamPaperSubmitItemVM;
-import com.ycl.jxkg.viewmodel.student.exam.ExamPaperSubmitVM;
-import com.ycl.jxkg.viewmodel.student.exampaper.ExamPaperAnswerPageVM;
+import com.ycl.jxkg.utils.DateTimeUtil;
+import com.ycl.jxkg.utils.ExamUtil;
+import com.ycl.jxkg.utils.JsonUtil;
+import com.ycl.jxkg.domain.vo.admin.paper.ExamPaperAnswerPageRequestVO;
+import com.ycl.jxkg.domain.vo.student.exam.ExamPaperSubmitItemVO;
+import com.ycl.jxkg.domain.vo.student.exam.ExamPaperSubmitVO;
+import com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageVO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -33,7 +36,8 @@
 import java.util.stream.Collectors;
 
 @Service
-public class ExamPaperAnswerServiceImpl extends BaseServiceImpl<ExamPaperAnswer> implements ExamPaperAnswerService {
+@RequiredArgsConstructor
+public class ExamPaperAnswerServiceImpl extends ServiceImpl<ExamPaperAnswerMapper , ExamPaperAnswer> implements ExamPaperAnswerService {
 
     private final ExamPaperAnswerMapper examPaperAnswerMapper;
     private final ExamPaperMapper examPaperMapper;
@@ -42,69 +46,60 @@
     private final ExamPaperQuestionCustomerAnswerService examPaperQuestionCustomerAnswerService;
     private final TaskExamCustomerAnswerMapper taskExamCustomerAnswerMapper;
 
-    @Autowired
-    public ExamPaperAnswerServiceImpl(ExamPaperAnswerMapper examPaperAnswerMapper, ExamPaperMapper examPaperMapper, TextContentService textContentService, QuestionMapper questionMapper, ExamPaperQuestionCustomerAnswerService examPaperQuestionCustomerAnswerService, TaskExamCustomerAnswerMapper taskExamCustomerAnswerMapper) {
-        super(examPaperAnswerMapper);
-        this.examPaperAnswerMapper = examPaperAnswerMapper;
-        this.examPaperMapper = examPaperMapper;
-        this.textContentService = textContentService;
-        this.questionMapper = questionMapper;
-        this.examPaperQuestionCustomerAnswerService = examPaperQuestionCustomerAnswerService;
-        this.taskExamCustomerAnswerMapper = taskExamCustomerAnswerMapper;
-    }
 
     @Override
-    public PageInfo<ExamPaperAnswer> studentPage(ExamPaperAnswerPageVM requestVM) {
+    public PageInfo<ExamPaperAnswer> studentPage(ExamPaperAnswerPageVO requestVM) {
         return PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "id desc").doSelectPageInfo(() ->
                 examPaperAnswerMapper.studentPage(requestVM));
     }
 
 
     @Override
-    public ExamPaperAnswerInfo calculateExamPaperAnswer(ExamPaperSubmitVM examPaperSubmitVM, User user) {
+    public ExamPaperAnswerInfo calculateExamPaperAnswer(ExamPaperSubmitVO examPaperSubmitVO, User user) {
         ExamPaperAnswerInfo examPaperAnswerInfo = new ExamPaperAnswerInfo();
         Date now = new Date();
-        ExamPaper examPaper = examPaperMapper.selectByPrimaryKey(examPaperSubmitVM.getId());
+        ExamPaper examPaper = examPaperMapper.selectById(examPaperSubmitVO.getId());
         ExamPaperTypeEnum paperTypeEnum = ExamPaperTypeEnum.fromCode(examPaper.getPaperType());
         //浠诲姟璇曞嵎鍙兘鍋氫竴娆�
-        if (paperTypeEnum == ExamPaperTypeEnum.Task) {
-            ExamPaperAnswer examPaperAnswer = examPaperAnswerMapper.getByPidUid(examPaperSubmitVM.getId(), user.getId());
+        if (paperTypeEnum == ExamPaperTypeEnum.RandomOrder) {
+            ExamPaperAnswer examPaperAnswer = examPaperAnswerMapper.getByPidUid(examPaperSubmitVO.getId(), user.getId());
             if (null != examPaperAnswer)
                 return null;
         }
-        String frameTextContent = textContentService.selectById(examPaper.getFrameTextContentId()).getContent();
-        List<ExamPaperTitleItemObject> examPaperTitleItemObjects = JsonUtil.toJsonListObject(frameTextContent, ExamPaperTitleItemObject.class);
-        List<Integer> questionIds = examPaperTitleItemObjects.stream().flatMap(t -> t.getQuestionItems().stream().map(q -> q.getId())).collect(Collectors.toList());
-        List<Question> questions = questionMapper.selectByIds(questionIds);
-        //灏嗛鐩粨鏋勭殑杞寲涓洪鐩瓟妗�
-        List<ExamPaperQuestionCustomerAnswer> examPaperQuestionCustomerAnswers = examPaperTitleItemObjects.stream()
-                .flatMap(t -> t.getQuestionItems().stream()
-                        .map(q -> {
-                            Question question = questions.stream().filter(tq -> tq.getId().equals(q.getId())).findFirst().get();
-                            ExamPaperSubmitItemVM customerQuestionAnswer = examPaperSubmitVM.getAnswerItems().stream()
-                                    .filter(tq -> tq.getQuestionId().equals(q.getId()))
-                                    .findFirst()
-                                    .orElse(null);
-                            return ExamPaperQuestionCustomerAnswerFromVM(question, customerQuestionAnswer, examPaper, q.getItemOrder(), user, now);
-                        })
-                ).collect(Collectors.toList());
-
-        ExamPaperAnswer examPaperAnswer = ExamPaperAnswerFromVM(examPaperSubmitVM, examPaper, examPaperQuestionCustomerAnswers, user, now);
-        examPaperAnswerInfo.setExamPaper(examPaper);
-        examPaperAnswerInfo.setExamPaperAnswer(examPaperAnswer);
-        examPaperAnswerInfo.setExamPaperQuestionCustomerAnswers(examPaperQuestionCustomerAnswers);
+        //TODO:寰呭畬鎴�
+//        String frameTextContent = textContentService.getById(examPaper.getFrameTextContentId()).getContent();
+//        List<ExamPaperTitleItemObject> examPaperTitleItemObjects = JsonUtil.toJsonListObject(frameTextContent, ExamPaperTitleItemObject.class);
+//        List<Integer> questionIds = examPaperTitleItemObjects.stream().flatMap(t -> t.getQuestionItems().stream().map(q -> q.getId())).collect(Collectors.toList());
+//        List<Question> questions = questionMapper.selectByIds(questionIds);
+//        //灏嗛鐩粨鏋勭殑杞寲涓洪鐩瓟妗�
+//        List<ExamPaperQuestionCustomerAnswer> examPaperQuestionCustomerAnswers = examPaperTitleItemObjects.stream()
+//                .flatMap(t -> t.getQuestionItems().stream()
+//                        .map(q -> {
+//                            Question question = questions.stream().filter(tq -> tq.getId().equals(q.getId())).findFirst().get();
+//                            ExamPaperSubmitItemVO customerQuestionAnswer = examPaperSubmitVO.getAnswerItems().stream()
+//                                    .filter(tq -> tq.getQuestionId().equals(q.getId()))
+//                                    .findFirst()
+//                                    .orElse(null);
+//                            return ExamPaperQuestionCustomerAnswerFromVM(question, customerQuestionAnswer, examPaper, q.getItemOrder(), user, now);
+//                        })
+//                ).collect(Collectors.toList());
+//
+//        ExamPaperAnswer examPaperAnswer = ExamPaperAnswerFromVM(examPaperSubmitVO, examPaper, examPaperQuestionCustomerAnswers, user, now);
+//        examPaperAnswerInfo.setExamPaper(examPaper);
+//        examPaperAnswerInfo.setExamPaperAnswer(examPaperAnswer);
+//        examPaperAnswerInfo.setExamPaperQuestionCustomerAnswers(examPaperQuestionCustomerAnswers);
         return examPaperAnswerInfo;
     }
 
     @Override
     @Transactional
-    public String judge(ExamPaperSubmitVM examPaperSubmitVM) {
-        ExamPaperAnswer examPaperAnswer = examPaperAnswerMapper.selectByPrimaryKey(examPaperSubmitVM.getId());
-        List<ExamPaperSubmitItemVM> judgeItems = examPaperSubmitVM.getAnswerItems().stream().filter(d -> d.getDoRight() == null).collect(Collectors.toList());
+    public String judge(ExamPaperSubmitVO examPaperSubmitVO) {
+        ExamPaperAnswer examPaperAnswer = examPaperAnswerMapper.selectById(examPaperSubmitVO.getId());
+        List<ExamPaperSubmitItemVO> judgeItems = examPaperSubmitVO.getAnswerItems().stream().filter(d -> d.getDoRight() == null).collect(Collectors.toList());
         List<ExamPaperAnswerUpdate> examPaperAnswerUpdates = new ArrayList<>(judgeItems.size());
         Integer customerScore = examPaperAnswer.getUserScore();
         Integer questionCorrect = examPaperAnswer.getQuestionCorrect();
-        for (ExamPaperSubmitItemVM d : judgeItems) {
+        for (ExamPaperSubmitItemVO d : judgeItems) {
             ExamPaperAnswerUpdate examPaperAnswerUpdate = new ExamPaperAnswerUpdate();
             examPaperAnswerUpdate.setId(d.getId());
             examPaperAnswerUpdate.setCustomerScore(ExamUtil.scoreFromVM(d.getScore()));
@@ -119,24 +114,25 @@
         examPaperAnswer.setUserScore(customerScore);
         examPaperAnswer.setQuestionCorrect(questionCorrect);
         examPaperAnswer.setStatus(ExamPaperAnswerStatusEnum.Complete.getCode());
-        examPaperAnswerMapper.updateByPrimaryKeySelective(examPaperAnswer);
+        examPaperAnswerMapper.updateById(examPaperAnswer);
         examPaperQuestionCustomerAnswerService.updateScore(examPaperAnswerUpdates);
 
         ExamPaperTypeEnum examPaperTypeEnum = ExamPaperTypeEnum.fromCode(examPaperAnswer.getPaperType());
         switch (examPaperTypeEnum) {
-            case Task:
+            case RandomOrder:
+                //TODO:寰呭畬鎴�
                 //浠诲姟璇曞嵎鎵规敼瀹屾垚鍚庯紝闇�瑕佹洿鏂颁换鍔$殑鐘舵��
-                ExamPaper examPaper = examPaperMapper.selectByPrimaryKey(examPaperAnswer.getExamPaperId());
-                Integer taskId = examPaper.getTaskExamId();
-                Integer userId = examPaperAnswer.getCreateUser();
-                TaskExamCustomerAnswer taskExamCustomerAnswer = taskExamCustomerAnswerMapper.getByTUid(taskId, userId);
-                TextContent textContent = textContentService.selectById(taskExamCustomerAnswer.getTextContentId());
-                List<TaskItemAnswerObject> taskItemAnswerObjects = JsonUtil.toJsonListObject(textContent.getContent(), TaskItemAnswerObject.class);
-                taskItemAnswerObjects.stream()
-                        .filter(d -> d.getExamPaperAnswerId().equals(examPaperAnswer.getId()))
-                        .findFirst().ifPresent(taskItemAnswerObject -> taskItemAnswerObject.setStatus(examPaperAnswer.getStatus()));
-                textContentService.jsonConvertUpdate(textContent, taskItemAnswerObjects, null);
-                textContentService.updateByIdFilter(textContent);
+//                ExamPaper examPaper = examPaperMapper.selectById(examPaperAnswer.getExamPaperId());
+//                Integer taskId = examPaper.getTaskExamId();
+//                Integer userId = examPaperAnswer.getCreateUser();
+//                TaskExamCustomerAnswer taskExamCustomerAnswer = taskExamCustomerAnswerMapper.getByTUid(taskId, userId);
+//                TextContent textContent = textContentService.getById(taskExamCustomerAnswer.getTextContentId());
+//                List<TaskItemAnswerObject> taskItemAnswerObjects = JsonUtil.toJsonListObject(textContent.getContent(), TaskItemAnswerObject.class);
+//                taskItemAnswerObjects.stream()
+//                        .filter(d -> d.getExamPaperAnswerId().equals(examPaperAnswer.getId()))
+//                        .findFirst().ifPresent(taskItemAnswerObject -> taskItemAnswerObject.setStatus(examPaperAnswer.getStatus()));
+//                textContentService.jsonConvertUpdate(textContent, taskItemAnswerObjects, null);
+//                textContentService.updateById(textContent);
                 break;
             default:
                 break;
@@ -145,18 +141,18 @@
     }
 
     @Override
-    public ExamPaperSubmitVM examPaperAnswerToVM(Integer id) {
-        ExamPaperSubmitVM examPaperSubmitVM = new ExamPaperSubmitVM();
-        ExamPaperAnswer examPaperAnswer = examPaperAnswerMapper.selectByPrimaryKey(id);
-        examPaperSubmitVM.setId(examPaperAnswer.getId());
-        examPaperSubmitVM.setDoTime(examPaperAnswer.getDoTime());
-        examPaperSubmitVM.setScore(ExamUtil.scoreToVM(examPaperAnswer.getUserScore()));
+    public ExamPaperSubmitVO examPaperAnswerToVM(Integer id) {
+        ExamPaperSubmitVO examPaperSubmitVO = new ExamPaperSubmitVO();
+        ExamPaperAnswer examPaperAnswer = examPaperAnswerMapper.selectById(id);
+        examPaperSubmitVO.setId(examPaperAnswer.getId());
+        examPaperSubmitVO.setDoTime(examPaperAnswer.getDoTime());
+        examPaperSubmitVO.setScore(ExamUtil.scoreToVM(examPaperAnswer.getUserScore()));
         List<ExamPaperQuestionCustomerAnswer> examPaperQuestionCustomerAnswers = examPaperQuestionCustomerAnswerService.selectListByPaperAnswerId(examPaperAnswer.getId());
-        List<ExamPaperSubmitItemVM> examPaperSubmitItemVMS = examPaperQuestionCustomerAnswers.stream()
+        List<ExamPaperSubmitItemVO> examPaperSubmitItemVOS = examPaperQuestionCustomerAnswers.stream()
                 .map(a -> examPaperQuestionCustomerAnswerService.examPaperQuestionCustomerAnswerToVM(a))
                 .collect(Collectors.toList());
-        examPaperSubmitVM.setAnswerItems(examPaperSubmitItemVMS);
-        return examPaperSubmitVM;
+        examPaperSubmitVO.setAnswerItems(examPaperSubmitItemVOS);
+        return examPaperSubmitVO;
     }
 
     @Override
@@ -188,17 +184,17 @@
      * @param now                    now
      * @return ExamPaperQuestionCustomerAnswer
      */
-    private ExamPaperQuestionCustomerAnswer ExamPaperQuestionCustomerAnswerFromVM(Question question, ExamPaperSubmitItemVM customerQuestionAnswer, ExamPaper examPaper, Integer itemOrder, User user, Date now) {
+    private ExamPaperQuestionCustomerAnswer ExamPaperQuestionCustomerAnswerFromVM(Question question, ExamPaperSubmitItemVO customerQuestionAnswer, ExamPaper examPaper, Integer itemOrder, User user, Date now) {
         ExamPaperQuestionCustomerAnswer examPaperQuestionCustomerAnswer = new ExamPaperQuestionCustomerAnswer();
         examPaperQuestionCustomerAnswer.setQuestionId(question.getId());
         examPaperQuestionCustomerAnswer.setExamPaperId(examPaper.getId());
-        examPaperQuestionCustomerAnswer.setQuestionScore(question.getScore());
+        examPaperQuestionCustomerAnswer.setQuestionScore(null);
         examPaperQuestionCustomerAnswer.setSubjectId(examPaper.getSubjectId());
         examPaperQuestionCustomerAnswer.setItemOrder(itemOrder);
         examPaperQuestionCustomerAnswer.setCreateTime(now);
         examPaperQuestionCustomerAnswer.setCreateUser(user.getId());
         examPaperQuestionCustomerAnswer.setQuestionType(question.getQuestionType());
-        examPaperQuestionCustomerAnswer.setQuestionTextContentId(question.getInfoTextContentId());
+        examPaperQuestionCustomerAnswer.setQuestionContent(question.getContent());
         if (null == customerQuestionAnswer) {
             examPaperQuestionCustomerAnswer.setCustomerScore(0);
         } else {
@@ -214,20 +210,20 @@
      * @param question                        question
      * @param customerQuestionAnswer          customerQuestionAnswer
      */
-    private void setSpecialFromVM(ExamPaperQuestionCustomerAnswer examPaperQuestionCustomerAnswer, Question question, ExamPaperSubmitItemVM customerQuestionAnswer) {
+    private void setSpecialFromVM(ExamPaperQuestionCustomerAnswer examPaperQuestionCustomerAnswer, Question question, ExamPaperSubmitItemVO customerQuestionAnswer) {
         QuestionTypeEnum questionTypeEnum = QuestionTypeEnum.fromCode(examPaperQuestionCustomerAnswer.getQuestionType());
         switch (questionTypeEnum) {
             case SingleChoice:
             case TrueFalse:
                 examPaperQuestionCustomerAnswer.setAnswer(customerQuestionAnswer.getContent());
                 examPaperQuestionCustomerAnswer.setDoRight(question.getCorrect().equals(customerQuestionAnswer.getContent()));
-                examPaperQuestionCustomerAnswer.setCustomerScore(examPaperQuestionCustomerAnswer.getDoRight() ? question.getScore() : 0);
+                examPaperQuestionCustomerAnswer.setCustomerScore(examPaperQuestionCustomerAnswer.getDoRight() ? null : 0);
                 break;
             case MultipleChoice:
                 String customerAnswer = ExamUtil.contentToString(customerQuestionAnswer.getContentArray());
                 examPaperQuestionCustomerAnswer.setAnswer(customerAnswer);
                 examPaperQuestionCustomerAnswer.setDoRight(customerAnswer.equals(question.getCorrect()));
-                examPaperQuestionCustomerAnswer.setCustomerScore(examPaperQuestionCustomerAnswer.getDoRight() ? question.getScore() : 0);
+                examPaperQuestionCustomerAnswer.setCustomerScore(examPaperQuestionCustomerAnswer.getDoRight() ? null : 0);
                 break;
             case GapFilling:
                 String correctAnswer = JsonUtil.toJsonStr(customerQuestionAnswer.getContentArray());
@@ -241,35 +237,36 @@
         }
     }
 
-    private ExamPaperAnswer ExamPaperAnswerFromVM(ExamPaperSubmitVM examPaperSubmitVM, ExamPaper examPaper, List<ExamPaperQuestionCustomerAnswer> examPaperQuestionCustomerAnswers, User user, Date now) {
+    private ExamPaperAnswer ExamPaperAnswerFromVM(ExamPaperSubmitVO examPaperSubmitVO, ExamPaper examPaper, List<ExamPaperQuestionCustomerAnswer> examPaperQuestionCustomerAnswers, User user, Date now) {
         Integer systemScore = examPaperQuestionCustomerAnswers.stream().mapToInt(a -> a.getCustomerScore()).sum();
         long questionCorrect = examPaperQuestionCustomerAnswers.stream().filter(a -> a.getCustomerScore().equals(a.getQuestionScore())).count();
         ExamPaperAnswer examPaperAnswer = new ExamPaperAnswer();
-        examPaperAnswer.setPaperName(examPaper.getName());
-        examPaperAnswer.setDoTime(examPaperSubmitVM.getDoTime());
-        examPaperAnswer.setExamPaperId(examPaper.getId());
-        examPaperAnswer.setCreateUser(user.getId());
-        examPaperAnswer.setCreateTime(now);
-        examPaperAnswer.setSubjectId(examPaper.getSubjectId());
-        examPaperAnswer.setQuestionCount(examPaper.getQuestionCount());
-        examPaperAnswer.setPaperScore(examPaper.getScore());
-        examPaperAnswer.setPaperType(examPaper.getPaperType());
-        examPaperAnswer.setSystemScore(systemScore);
-        examPaperAnswer.setUserScore(systemScore);
-        examPaperAnswer.setTaskExamId(examPaper.getTaskExamId());
-        examPaperAnswer.setQuestionCorrect((int) questionCorrect);
-        boolean needJudge = examPaperQuestionCustomerAnswers.stream().anyMatch(d -> QuestionTypeEnum.needSaveTextContent(d.getQuestionType()));
-        if (needJudge) {
-            examPaperAnswer.setStatus(ExamPaperAnswerStatusEnum.WaitJudge.getCode());
-        } else {
-            examPaperAnswer.setStatus(ExamPaperAnswerStatusEnum.Complete.getCode());
-        }
+        //TODO:寰呭畬鎴�
+//        examPaperAnswer.setPaperName(examPaper.getName());
+//        examPaperAnswer.setDoTime(examPaperSubmitVO.getDoTime());
+//        examPaperAnswer.setExamPaperId(examPaper.getId());
+//        examPaperAnswer.setCreateUser(user.getId());
+//        examPaperAnswer.setCreateTime(now);
+//        examPaperAnswer.setSubjectId(examPaper.getSubjectId());
+//        examPaperAnswer.setQuestionCount(examPaper.getQuestionCount());
+//        examPaperAnswer.setPaperScore(examPaper.getScore());
+//        examPaperAnswer.setPaperType(examPaper.getPaperType());
+//        examPaperAnswer.setSystemScore(systemScore);
+//        examPaperAnswer.setUserScore(systemScore);
+//        examPaperAnswer.setTaskExamId(examPaper.getTaskExamId());
+//        examPaperAnswer.setQuestionCorrect((int) questionCorrect);
+//        boolean needJudge = examPaperQuestionCustomerAnswers.stream().anyMatch(d -> QuestionTypeEnum.needSaveTextContent(d.getQuestionType()));
+//        if (needJudge) {
+//            examPaperAnswer.setStatus(ExamPaperAnswerStatusEnum.WaitJudge.getCode());
+//        } else {
+//            examPaperAnswer.setStatus(ExamPaperAnswerStatusEnum.Complete.getCode());
+//        }
         return examPaperAnswer;
     }
 
 
     @Override
-    public PageInfo<ExamPaperAnswer> adminPage(com.ycl.jxkg.viewmodel.admin.paper.ExamPaperAnswerPageRequestVM requestVM) {
+    public PageInfo<ExamPaperAnswer> adminPage(ExamPaperAnswerPageRequestVO requestVM) {
         return PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "id desc").doSelectPageInfo(() ->
                 examPaperAnswerMapper.adminPage(requestVM));
     }

--
Gitblit v1.8.0