|
@@ -1,10 +1,10 @@
|
|
|
package edu.math.diagnosis.service;
|
|
|
|
|
|
+import edu.math.diagnosis.config.Constants;
|
|
|
import edu.math.diagnosis.dao.OptionRepo;
|
|
|
import edu.math.diagnosis.dao.PaperRepo;
|
|
|
import edu.math.diagnosis.dao.QuestionRepo;
|
|
|
import edu.math.diagnosis.entity.*;
|
|
|
-import edu.math.diagnosis.config.Constants;
|
|
|
import edu.math.diagnosis.model.PaperVo;
|
|
|
import edu.math.diagnosis.model.Result;
|
|
|
import edu.math.diagnosis.util.CommonUtil;
|
|
@@ -25,7 +25,6 @@ import org.springframework.util.Assert;
|
|
|
import javax.annotation.Resource;
|
|
|
import java.util.*;
|
|
|
import java.util.concurrent.ConcurrentHashMap;
|
|
|
-import java.util.concurrent.ConcurrentLinkedQueue;
|
|
|
import java.util.regex.Matcher;
|
|
|
import java.util.regex.Pattern;
|
|
|
import java.util.stream.Collectors;
|
|
@@ -68,6 +67,8 @@ public class PaperService {
|
|
|
return papers;
|
|
|
}
|
|
|
|
|
|
+ logger.info("papers size is {},status is {}", papers.size(), status);
|
|
|
+
|
|
|
Iterator<Paper> iterator = papers.iterator();
|
|
|
while (iterator.hasNext()) {
|
|
|
Paper paper = iterator.next();
|
|
@@ -75,6 +76,7 @@ public class PaperService {
|
|
|
List<Question> questions = questionService.listQuestionByPaper(paper);
|
|
|
List<Section> sections = sectionService.findByPid(paper.getId());
|
|
|
paper.setSections(sections);
|
|
|
+ logger.info("paper id is {},questionNum is {},questions size is {},sections size is {}", paper.getId(), questionNum, questions.size(), sections.size());
|
|
|
if (Constants.ALEADY.equals(status)) {
|
|
|
if (questions.size() < questionNum) {
|
|
|
iterator.remove();
|
|
@@ -85,6 +87,7 @@ public class PaperService {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ logger.info("after filter,papers size is {}", papers.size());
|
|
|
return papers;
|
|
|
}
|
|
|
|
|
@@ -368,7 +371,7 @@ public class PaperService {
|
|
|
questions.forEach((k, v) -> {
|
|
|
Matcher matcher = pattern.matcher(k);
|
|
|
if (k.matches(template.getQuestion()) && matcher.find()) {
|
|
|
- String code= matcher.group();
|
|
|
+ String code = matcher.group();
|
|
|
Question question = questionService.initQuestion(section.getNumber(), section.getStartNumber(), Integer.valueOf(code));
|
|
|
wordService.parseQuestion(question, v, topic, template, abilities);
|
|
|
list.add(question);
|