From 13a68df58b3f937db5ba6437c814bafdcd8d37f8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 27 五月 2024 16:09:41 +0800
Subject: [PATCH] 登录时如果不是部门管理员则deptIds填充为用户所在部门
---
src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java
index bdb28c9..3e5ce6b 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.mindskip.xzs.base.RestResponse;
+import com.mindskip.xzs.domain.DeptQuestion;
import com.mindskip.xzs.domain.QuestionSubject;
import com.mindskip.xzs.domain.other.KeyValue;
import com.mindskip.xzs.domain.Question;
@@ -10,8 +11,11 @@
import com.mindskip.xzs.domain.enums.QuestionTypeEnum;
import com.mindskip.xzs.domain.question.QuestionItemObject;
import com.mindskip.xzs.domain.question.QuestionObject;
+import com.mindskip.xzs.domain.vo.DeptQuestionVO;
import com.mindskip.xzs.domain.vo.QuestionContentVO;
import com.mindskip.xzs.domain.vo.QuestionVO;
+import com.mindskip.xzs.repository.BaseMapper;
+import com.mindskip.xzs.repository.DeptQuestionMapper;
import com.mindskip.xzs.repository.QuestionMapper;
import com.mindskip.xzs.repository.SubjectMapper;
import com.mindskip.xzs.service.QuestionService;
@@ -30,10 +34,12 @@
import com.mindskip.xzs.viewmodel.student.question.answer.QuestionPageStudentResponseVM;
import com.mindskip.xzs.vo.QuestionExportVO;
import com.mindskip.xzs.vo.QuestionImportVO;
+import lombok.RequiredArgsConstructor;
import org.modelmapper.ModelMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.Arrays;
@@ -51,15 +57,16 @@
private final SubjectService subjectService;
private final QuestionSubjectService questionSubjectService;
private final SubjectMapper subjectMapper;
+ private final DeptQuestionMapper deptQuestionMapper;
- @Autowired
- public QuestionServiceImpl(QuestionMapper questionMapper, TextContentService textContentService, SubjectService subjectService, QuestionSubjectService questionSubjectService, SubjectMapper subjectMapper) {
- super(questionMapper);
- this.textContentService = textContentService;
+ public QuestionServiceImpl(BaseMapper<Question> baseMapper, QuestionMapper questionMapper, TextContentService textContentService, SubjectService subjectService, QuestionSubjectService questionSubjectService, SubjectMapper subjectMapper, DeptQuestionMapper deptQuestionMapper) {
+ super(baseMapper);
this.questionMapper = questionMapper;
+ this.textContentService = textContentService;
this.subjectService = subjectService;
this.questionSubjectService = questionSubjectService;
this.subjectMapper = subjectMapper;
+ this.deptQuestionMapper = deptQuestionMapper;
}
@Override
@@ -74,16 +81,15 @@
@Transactional
public Question insertFullQuestion(QuestionEditRequestVM model, Integer userId) {
Date now = new Date();
-// Integer gradeLevel = subjectService.levelBySubjectId(model.getSubjectId());
- //棰樺共銆佽В鏋愩�侀�夐」绛� 鎻掑叆
+ // 棰樺共銆佽В鏋愩�侀�夐」绛� 鎻掑叆
TextContent infoTextContent = new TextContent();
infoTextContent.setCreateTime(now);
setQuestionInfoFromVM(infoTextContent, model);
textContentService.insertByFilter(infoTextContent);
+ // 棰樼洰鎻掑叆
Question question = new Question();
-// question.setSubjectId(model.getSubjectId());
question.setGradeLevel(model.getGradeLevel());
question.setCreateTime(now);
question.setQuestionType(model.getQuestionType());
@@ -96,8 +102,19 @@
question.setDeleted(false);
questionMapper.insertSelective(question);
+ // 棰樼洰鎵�灞為儴闂ㄦ彃鍏�
+ List<DeptQuestion> deptQuestions = model.getDeptIds().stream().map(deptId -> {
+ DeptQuestion deptQuestion = new DeptQuestion();
+ deptQuestion.setQuestionId(question.getId());
+ deptQuestion.setDeptId(deptId);
+ return deptQuestion;
+ }).collect(Collectors.toList());
+ if (! CollectionUtils.isEmpty(model.getDeptIds())) {
+ deptQuestionMapper.add(deptQuestions);
+ }
+
//鎵归噺娣诲姞
- List<QuestionSubject> list = Arrays.asList(model.getSubjectIds()).stream().map(e->{
+ List<QuestionSubject> list = Arrays.asList(model.getSubjectIds()).stream().map(e -> {
QuestionSubject questionSubject = new QuestionSubject();
questionSubject.setQuestionId(question.getId());
questionSubject.setSubjectId(e);
@@ -111,7 +128,8 @@
@Override
@Transactional
public Question updateFullQuestion(QuestionEditRequestVM model) {
-// Integer gradeLevel = subjectService.levelBySubjectId(model.getSubjectId());
+
+ // 棰樼洰淇敼
Question question = questionMapper.selectByPrimaryKey(model.getId());
question.setSubjectId(model.getSubjectId());
question.setGradeLevel(model.getGradeLevel());
@@ -120,6 +138,18 @@
question.setCorrectFromVM(model.getCorrect(), model.getCorrectArray());
questionMapper.updateByPrimaryKeySelective(question);
+ // 澶勭悊棰樼洰鎵�灞為儴闂�
+ deptQuestionMapper.remove(question.getId());
+ List<DeptQuestion> deptQuestions = model.getDeptIds().stream().map(deptId -> {
+ DeptQuestion deptQuestion = new DeptQuestion();
+ deptQuestion.setQuestionId(question.getId());
+ deptQuestion.setDeptId(deptId);
+ return deptQuestion;
+ }).collect(Collectors.toList());
+ if (! CollectionUtils.isEmpty(model.getDeptIds())) {
+ deptQuestionMapper.add(deptQuestions);
+ }
+
//棰樺共銆佽В鏋愩�侀�夐」绛� 鏇存柊
TextContent infoTextContent = textContentService.selectById(question.getInfoTextContentId());
setQuestionInfoFromVM(infoTextContent, model);
@@ -127,7 +157,7 @@
questionSubjectService.removeQuestionId(question.getId());
//鎵归噺娣诲姞
- List<QuestionSubject> list = Arrays.asList(model.getSubjectIds()).stream().map(e->{
+ List<QuestionSubject> list = Arrays.asList(model.getSubjectIds()).stream().map(e -> {
QuestionSubject questionSubject = new QuestionSubject();
questionSubject.setQuestionId(question.getId());
questionSubject.setSubjectId(e);
@@ -141,9 +171,9 @@
@Override
public ExamQuestionVO getQuestionEditRequestVM(Integer questionId) {
- //棰樼洰鏄犲皠
+ // 棰樼洰鏄犲皠
Question question = questionMapper.selectByPrimaryKey(questionId);
- List<QuestionSubject> list = questionSubjectService.getQuestion(questionId).stream().map(e->{
+ List<QuestionSubject> list = questionSubjectService.getQuestion(questionId).stream().map(e -> {
SubjectPageRequestVM subject = new SubjectPageRequestVM();
subject.setId(e.getSubjectId());
e.setSubName(subjectMapper.page(subject).get(0).getName());
@@ -151,6 +181,10 @@
}).collect(Collectors.toList());
ExamQuestionVO questionEditRequestVM = getQuestionEditRequestVM(question);
questionEditRequestVM.setQuestionSubjects(list);
+ // 鏌ヨ棰樼洰鎵�灞為儴闂�
+ List<Integer> deptIds = deptQuestionMapper.deptByQuestionId(questionId)
+ .stream().map(DeptQuestionVO::getDeptId).collect(Collectors.toList());
+ questionEditRequestVM.setDeptIds(deptIds);
return questionEditRequestVM;
}
@@ -241,7 +275,7 @@
question.setDeleted(true);
questionMapper.updateByPrimaryKeySelective(question);
List<Integer> list = questionSubjectService.getQuestion(id)
- .stream().map(e->{
+ .stream().map(e -> {
return e.getId();
}).collect(Collectors.toList());
return questionSubjectService.removes(list.toArray(new Integer[list.size()]));
--
Gitblit v1.8.0