龚焕茏
2024-06-04 db7ff10c4090564126bf78447fb038406812f321
src/main/java/com/ycl/jxkg/controller/student/QuestionAnswerController.java
@@ -2,9 +2,9 @@
import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.ExamPaperQuestionCustomerAnswer;
import com.ycl.jxkg.domain.Subject;
import com.ycl.jxkg.domain.TextContent;
import com.ycl.jxkg.domain.entity.ExamPaperQuestionCustomerAnswer;
import com.ycl.jxkg.domain.entity.Subject;
import com.ycl.jxkg.domain.entity.TextContent;
import com.ycl.jxkg.domain.question.QuestionObject;
import com.ycl.jxkg.service.ExamPaperQuestionCustomerAnswerService;
import com.ycl.jxkg.service.QuestionService;
@@ -14,15 +14,14 @@
import com.ycl.jxkg.utils.HtmlUtil;
import com.ycl.jxkg.utils.JsonUtil;
import com.ycl.jxkg.utils.PageInfoHelper;
import com.ycl.jxkg.vo.admin.question.QuestionEditRequestVO;
import com.ycl.jxkg.vo.student.exam.ExamPaperSubmitItemVO;
import com.ycl.jxkg.vo.student.question.answer.QuestionAnswerVO;
import com.ycl.jxkg.vo.student.question.answer.QuestionPageStudentRequestVO;
import com.ycl.jxkg.vo.student.question.answer.QuestionPageStudentResponseVO;
import com.ycl.jxkg.domain.vo.admin.question.QuestionEditRequestVO;
import com.ycl.jxkg.domain.vo.student.exam.ExamPaperSubmitItemVO;
import com.ycl.jxkg.domain.vo.student.question.answer.QuestionAnswerVO;
import com.ycl.jxkg.domain.vo.student.question.answer.QuestionPageStudentRequestVO;
import com.ycl.jxkg.domain.vo.student.question.answer.QuestionPageStudentResponseVO;
import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@RequiredArgsConstructor
@@ -44,8 +43,7 @@
            QuestionPageStudentResponseVO vo = new QuestionPageStudentResponseVO();
            BeanUtils.copyProperties(q, vo);
            vo.setCreateTime(DateTimeUtil.dateFormat(q.getCreateTime()));
            TextContent textContent = textContentService.getById(q.getQuestionTextContentId());
            QuestionObject questionObject = JsonUtil.toJsonObject(textContent.getContent(), QuestionObject.class);
            QuestionObject questionObject = JsonUtil.toJsonObject(q.getQuestionContent(), QuestionObject.class);
            String clearHtml = HtmlUtil.clear(questionObject.getTitleContent());
            vo.setShortTitle(clearHtml);
            vo.setSubjectName(subject.getName());