|
@@ -238,35 +238,25 @@ public class SpecialReportService {
|
|
|
mind.setQuestionNum(qidss.length);
|
|
|
|
|
|
for (String s : qidss) {
|
|
|
+ int number = 0;
|
|
|
if (s.matches("\\d+[A-E]")) {
|
|
|
Matcher matcher = pattern.matcher(s);
|
|
|
- int number = 0;
|
|
|
if (matcher.find()) {
|
|
|
number = Integer.parseInt(matcher.group());
|
|
|
} else {
|
|
|
logger.error("未检测到题号,qids={}", qids);
|
|
|
continue;
|
|
|
}
|
|
|
- if(map.containsKey(number) && StringUtils.isBlank(map.get(number))){
|
|
|
-
|
|
|
- mind.setCollectNum(mind.getCollectNum() - 1);
|
|
|
- }else if (map.containsKey(number)) {
|
|
|
- String options = map.get(number);
|
|
|
- if (s.contains(options)) {
|
|
|
- mind.setCollectNum(mind.getCollectNum() - 1);
|
|
|
- }
|
|
|
- }
|
|
|
} else {
|
|
|
- int number = Integer.parseInt(s);
|
|
|
- if (map.containsKey(number) && StringUtils.isBlank(map.get(number))) {
|
|
|
-
|
|
|
+ number = Integer.parseInt(s);
|
|
|
+ }
|
|
|
+ if (map.containsKey(number) && StringUtils.isBlank(map.get(number))) {
|
|
|
+
|
|
|
+ mind.setCollectNum(mind.getCollectNum() - 1);
|
|
|
+ } else if (map.containsKey(number)) {
|
|
|
+ String options = map.get(number);
|
|
|
+ if (s.contains(options)) {
|
|
|
mind.setCollectNum(mind.getCollectNum() - 1);
|
|
|
- } else if (map.containsKey(number)) {
|
|
|
-
|
|
|
- String options = map.get(number);
|
|
|
- if (s.contains(options)) {
|
|
|
- mind.setCollectNum(mind.getCollectNum() - 1);
|
|
|
- }
|
|
|
}
|
|
|
}
|
|
|
}
|