From 9e3d47a16aa7b4ed4edbcc1a09ac5949aa8f8ff6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 14 六月 2024 10:50:52 +0800
Subject: [PATCH] 定时保存临时试卷

---
 src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java |   48 +++++++++++++++++++++++++++---------------------
 1 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
index 3f3d40f..9e6a0d2 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
@@ -1,25 +1,25 @@
 package com.ycl.jxkg.service.impl;
 
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.jxkg.domain.enums.general.StatusEnum;
-import com.ycl.jxkg.domain.other.KeyValue;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ycl.jxkg.domain.entity.Question;
-import com.ycl.jxkg.domain.enums.QuestionTypeEnum;
+import com.ycl.jxkg.enums.QuestionTypeEnum;
+import com.ycl.jxkg.enums.general.StatusEnum;
+import com.ycl.jxkg.domain.other.KeyValue;
 import com.ycl.jxkg.domain.question.QuestionItemObject;
 import com.ycl.jxkg.domain.question.QuestionObject;
-import com.ycl.jxkg.domain.vo.admin.question.QuestionResponseVO;
-import com.ycl.jxkg.mapper.QuestionMapper;
-import com.ycl.jxkg.service.QuestionService;
-import com.ycl.jxkg.service.SubjectService;
-import com.ycl.jxkg.service.TextContentService;
-import com.ycl.jxkg.utils.DateTimeUtil;
-import com.ycl.jxkg.utils.JsonUtil;
-import com.ycl.jxkg.utils.ExamUtil;
 import com.ycl.jxkg.domain.vo.admin.question.QuestionEditItemVO;
 import com.ycl.jxkg.domain.vo.admin.question.QuestionEditRequestVO;
 import com.ycl.jxkg.domain.vo.admin.question.QuestionPageRequestVO;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
+import com.ycl.jxkg.domain.vo.admin.question.QuestionResponseVO;
+import com.ycl.jxkg.mapper.QuestionMapper;
+import com.ycl.jxkg.service.QuestionService;
+import com.ycl.jxkg.utils.DateTimeUtil;
+import com.ycl.jxkg.utils.ExamUtil;
+import com.ycl.jxkg.utils.HtmlUtil;
+import com.ycl.jxkg.utils.JsonUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -27,7 +27,6 @@
 
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Service
@@ -35,13 +34,11 @@
 public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> implements QuestionService {
 
     private final QuestionMapper questionMapper;
-    private final TextContentService textContentService;
-    private final SubjectService subjectService;
 
 
     @Override
     public PageInfo<QuestionResponseVO> page(QuestionPageRequestVO requestVM) {
-        return PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "id desc").doSelectPageInfo(() ->
+        return PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "create_time desc").doSelectPageInfo(() ->
                 questionMapper.page(requestVM)
         );
     }
@@ -64,6 +61,9 @@
         question.setDifficult(model.getDifficult());
         question.setContent(questionObject);
         question.setCreateUser(userId);
+        question.setTitle(HtmlUtil.clear(model.getTitle()));
+        question.setAudioFile(model.getAudioFile());
+        question.setOriginalFile(model.getOriginalFile());
         questionMapper.insert(question);
         return question;
     }
@@ -78,6 +78,9 @@
         //棰樺共銆佽В鏋愩�侀�夐」绛� 鏇存柊
         String questionObject = setQuestionInfoFromVM(model);
         question.setContent(questionObject);
+        question.setTitle(HtmlUtil.clear(model.getTitle()));
+        question.setAudioFile(model.getAudioFile());
+        question.setOriginalFile(model.getOriginalFile());
         questionMapper.updateById(question);
         return question;
     }
@@ -124,9 +127,6 @@
         List<QuestionEditItemVO> editItems = questionObject.getQuestionItemObjects().stream().map(o -> {
             QuestionEditItemVO questionEditItemVO = new QuestionEditItemVO();
             BeanUtils.copyProperties(o, questionEditItemVO);
-            if (o.getScore() != null) {
-                questionEditItemVO.setScore(ExamUtil.scoreToVM(o.getScore()));
-            }
             return questionEditItemVO;
         }).collect(Collectors.toList());
         questionEditRequestVO.setItems(editItems);
@@ -140,7 +140,6 @@
                     item.setPrefix(i.getPrefix());
                     item.setContent(i.getContent());
                     item.setItemUuid(i.getItemUuid());
-                    item.setScore(ExamUtil.scoreFromVM(i.getScore()));
                     return item;
                 }
         ).collect(Collectors.toList());
@@ -169,5 +168,12 @@
         }).collect(Collectors.toList());
     }
 
+    @Override
+    public Boolean updateStatus(QuestionResponseVO question) {
+        return new LambdaUpdateChainWrapper<>(questionMapper)
+                .set(Question::getStatus, question.getStatus())
+                .eq(Question::getId, question.getId())
+                .update();
+    }
 
 }

--
Gitblit v1.8.0