From fc36338476ccb0e8fa641794de4022f300f59a2e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 16 七月 2024 13:59:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 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 3e5ce6b..c86f205 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java
@@ -32,6 +32,7 @@
import com.github.pagehelper.PageInfo;
import com.mindskip.xzs.viewmodel.student.question.answer.QuestionPageStudentRequestVM;
import com.mindskip.xzs.viewmodel.student.question.answer.QuestionPageStudentResponseVM;
+import com.mindskip.xzs.vo.QuestionExportData;
import com.mindskip.xzs.vo.QuestionExportVO;
import com.mindskip.xzs.vo.QuestionImportVO;
import lombok.RequiredArgsConstructor;
@@ -103,14 +104,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);
+ }
}
//鎵归噺娣诲姞
@@ -298,6 +301,11 @@
}
@Override
+ public List<QuestionExportData> exportData(QuestionExportVO query) {
+ return questionMapper.exportData(query);
+ }
+
+ @Override
public PageInfo<QuestionPageStudentResponseVM> selectQuestion(QuestionPageStudentRequestVM model) {
return PageHelper.startPage(model.getPageIndex(), model.getPageSize()).doSelectPageInfo(() ->
questionMapper.selectQuestion(model).stream().peek(
@@ -336,6 +344,11 @@
return RestResponse.ok(null);
}
+ @Override
+ public Integer countQuestionByTitle(String title) {
+ return questionMapper.countQuestionByTitle(title);
+ }
+
/**
* 澶勭悊棰樼洰鍐呭JSON
*
--
Gitblit v1.8.0