|
@@ -821,10 +821,14 @@ public class PaperServiceImpl implements PaperService {
|
|
|
*/
|
|
|
public List<String> deleteImportQuestionById(String questionId, User user) {
|
|
|
Question ques = Model.of(quesRepo.findById(questionId));
|
|
|
+
|
|
|
List<PaperDetailUnit> pdus = CommonUtils.toList(paperDetailUnitRepo.findByQuestion(ques));
|
|
|
- List<String> paperNames = new ArrayList<String>();
|
|
|
- List<PaperDetailUnit> needPdus = new ArrayList<PaperDetailUnit>();// 需要删除的小题
|
|
|
- List<Paper> papers = new ArrayList<Paper>();
|
|
|
+ List<String> paperNames = new ArrayList<>();
|
|
|
+
|
|
|
+ // 需要删除的小题
|
|
|
+ List<PaperDetailUnit> needPdus = new ArrayList<>();
|
|
|
+
|
|
|
+ List<Paper> papers = new ArrayList<>();
|
|
|
for (PaperDetailUnit pdu : pdus) {
|
|
|
if (pdu.getPaper() != null) {
|
|
|
if (!papers.contains(pdu.getPaper())) {
|
|
@@ -841,10 +845,12 @@ public class PaperServiceImpl implements PaperService {
|
|
|
paperDetailUnitRepo.deleteAll(needPdus);
|
|
|
quesBakRepo.save(BeanCopierUtil.copyProperties(ques, QuestionBak.class));
|
|
|
quesRepo.delete(ques);
|
|
|
+
|
|
|
for (Paper paper : papers) {
|
|
|
formatPaper(paper, user);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
return paperNames;
|
|
|
}
|
|
|
|