From 47cd9ecc0eff38ffe6b3b794b2bf197e958f4403 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 14 五月 2025 15:50:57 +0800 Subject: [PATCH] bug:学员有状态不能修改问题 --- src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java | 35 +++++++++++++++++++++++++++-------- 1 files changed, 27 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 f6925e4..956e398 100644 --- a/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java +++ b/src/main/java/com/mindskip/xzs/service/impl/QuestionServiceImpl.java @@ -32,8 +32,10 @@ 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 com.mindskip.xzs.vo.QuestionSubjectVO; import lombok.RequiredArgsConstructor; import org.modelmapper.ModelMapper; import org.springframework.beans.factory.annotation.Autowired; @@ -103,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); + } } //鎵归噺娣诲姞 @@ -139,7 +143,7 @@ questionMapper.updateByPrimaryKeySelective(question); // 澶勭悊棰樼洰鎵�灞為儴闂� - deptQuestionMapper.remove(question.getId(), model.getDeptIds()); + deptQuestionMapper.remove(question.getId()); List<DeptQuestion> deptQuestions = model.getDeptIds().stream().map(deptId -> { DeptQuestion deptQuestion = new DeptQuestion(); deptQuestion.setQuestionId(question.getId()); @@ -298,6 +302,11 @@ } @Override + public List<QuestionImportVO> 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 +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