From 7fd0771bbebafa36bc007ceb581cdaab4d290c82 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 06 六月 2024 09:18:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java | 48 ++++++++++++++++++++----------------------------
1 files changed, 20 insertions(+), 28 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 7b83e10..4ceda84 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
@@ -1,26 +1,24 @@
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.other.KeyValue;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
import com.ycl.jxkg.domain.entity.Question;
-import com.ycl.jxkg.domain.entity.TextContent;
-import com.ycl.jxkg.domain.enums.QuestionStatusEnum;
import com.ycl.jxkg.domain.enums.QuestionTypeEnum;
+import com.ycl.jxkg.domain.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.JsonUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -35,13 +33,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)
);
}
@@ -51,19 +47,16 @@
@Transactional
public Question insertFullQuestion(QuestionEditRequestVO model, Integer userId) {
Date now = new Date();
- Integer gradeLevel = subjectService.levelBySubjectId(model.getSubjectId());
//棰樺共銆佽В鏋愩�侀�夐」绛� 鎻掑叆
String questionObject = setQuestionInfoFromVM(model);
Question question = new Question();
question.setSubjectId(model.getSubjectId());
- question.setGradeLevel(gradeLevel);
question.setCreateTime(now);
question.setQuestionType(model.getQuestionType());
- question.setStatus(QuestionStatusEnum.OK.getCode());
+ question.setStatus(StatusEnum.ENABLE);
question.setCorrectFromVM(model.getCorrect(), model.getCorrectArray());
- question.setScore(ExamUtil.scoreFromVM(model.getScore()));
question.setDifficult(model.getDifficult());
question.setContent(questionObject);
question.setCreateUser(userId);
@@ -74,11 +67,8 @@
@Override
@Transactional
public Question updateFullQuestion(QuestionEditRequestVO model) {
- Integer gradeLevel = subjectService.levelBySubjectId(model.getSubjectId());
Question question = questionMapper.selectById(model.getId());
question.setSubjectId(model.getSubjectId());
- question.setGradeLevel(gradeLevel);
- question.setScore(ExamUtil.scoreFromVM(model.getScore()));
question.setDifficult(model.getDifficult());
question.setCorrectFromVM(model.getCorrect(), model.getCorrectArray());
//棰樺共銆佽В鏋愩�侀�夐」绛� 鏇存柊
@@ -123,7 +113,6 @@
default:
break;
}
- questionEditRequestVO.setScore(ExamUtil.scoreToVM(question.getScore()));
questionEditRequestVO.setAnalyze(questionObject.getAnalyze());
@@ -131,9 +120,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);
@@ -147,7 +133,6 @@
item.setPrefix(i.getPrefix());
item.setContent(i.getContent());
item.setItemUuid(i.getItemUuid());
- item.setScore(ExamUtil.scoreFromVM(i.getScore()));
return item;
}
).collect(Collectors.toList());
@@ -176,5 +161,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