From 32ec64370ad5af7df86d59acdc134e697d936db2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 23 九月 2024 20:41:11 +0800
Subject: [PATCH] 课目管理
---
src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 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 1edf777..956e398 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java
@@ -35,6 +35,7 @@
import com.mindskip.xzs.vo.QuestionExportData;
import com.mindskip.xzs.vo.QuestionExportVO;
import com.mindskip.xzs.vo.QuestionImportVO;
+import com.mindskip.xzs.vo.QuestionSubjectVO;
import lombok.RequiredArgsConstructor;
import org.modelmapper.ModelMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -104,14 +105,16 @@
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<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);
+ }
}
//鎵归噺娣诲姞
@@ -299,7 +302,7 @@
}
@Override
- public List<QuestionExportData> exportData(QuestionExportVO query) {
+ public List<QuestionImportVO> exportData(QuestionExportVO query) {
return questionMapper.exportData(query);
}
@@ -342,6 +345,16 @@
return RestResponse.ok(null);
}
+ @Override
+ public Integer countQuestionByTitle(String title) {
+ return questionMapper.countQuestionByTitle(title);
+ }
+
+ @Override
+ public List<QuestionSubjectVO> countQuestionByTitleAndSubject(String title, Integer subjectId) {
+ return questionMapper.countQuestionByTitleAndSubject(title, subjectId);
+ }
+
/**
* 澶勭悊棰樼洰鍐呭JSON
*
--
Gitblit v1.8.0