|
@@ -194,7 +194,7 @@ public class ScanAnswerCardServiceImpl extends ServiceImpl<ScanAnswerCardMapper,
|
|
|
// 解析卡格式文件
|
|
|
cardFile = parseCardFile(fileData);
|
|
|
List<ScanAnswerCardQuestion> scanAnswerCardQuestions = new ArrayList<>();
|
|
|
- int i = 1;
|
|
|
+ int i = 0;
|
|
|
for (CardPageWrapper page : cardFile.getPages()) {
|
|
|
for (FillArea fillArea : page.getExchange().getFillArea().stream().filter(m -> OmrField.QUESTION.name().equals(m.getField().toUpperCase())).collect(Collectors.toList())) {
|
|
|
for (FillItem item : fillArea.getItems()) {
|
|
@@ -210,7 +210,7 @@ public class ScanAnswerCardServiceImpl extends ServiceImpl<ScanAnswerCardMapper,
|
|
|
scanAnswerCardQuestion.setOptionCount(item.getOptions().size());
|
|
|
scanAnswerCardQuestion.setQuestionType(fillArea.isSingle() ? 1 : 2);
|
|
|
scanAnswerCardQuestion.setPaperIndex(i / 2 + 1);
|
|
|
- scanAnswerCardQuestion.setPageIndex(i % 2 == 1 ? 1 : 2);
|
|
|
+ scanAnswerCardQuestion.setPageIndex((i+1) % 2 == 1 ? 1 : 2);
|
|
|
scanAnswerCardQuestion.setCreateTime(System.currentTimeMillis());
|
|
|
scanAnswerCardQuestions.add(scanAnswerCardQuestion);
|
|
|
}
|