|
@@ -90,6 +90,8 @@ public class ImportPaperService {
|
|
|
|
|
|
public static final String TEMP_FILE_EXP = "docxExport/";
|
|
public static final String TEMP_FILE_EXP = "docxExport/";
|
|
|
|
|
|
|
|
+ private Random random = new Random();
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 获取上传文件
|
|
* 获取上传文件
|
|
*
|
|
*
|
|
@@ -1245,7 +1247,7 @@ public class ImportPaperService {
|
|
processQuesBody(pList, importPaperCheck.index, subQuesNum, subQues, importPaperCheck, wordMLPackage, subQuesNum);
|
|
processQuesBody(pList, importPaperCheck.index, subQuesNum, subQues, importPaperCheck, wordMLPackage, subQuesNum);
|
|
processQuesTail(pList, importPaperCheck.index, subQuesNum, subQues, paperDetailUnit, importPaperCheck, wordMLPackage, true, paper, subQuesNum);
|
|
processQuesTail(pList, importPaperCheck.index, subQuesNum, subQues, paperDetailUnit, importPaperCheck, wordMLPackage, true, paper, subQuesNum);
|
|
//填空题空格校验
|
|
//填空题空格校验
|
|
- if (subQues.getQuestionType().getName() == QuesStructType.FILL_BLANK_QUESTION.getName()) {
|
|
|
|
|
|
+ if (QuesStructType.FILL_BLANK_QUESTION.getName().equals(subQues.getQuestionType().getName())) {
|
|
processFill(subQues, paperDetailUnit, importPaperCheck, subQuesNum, subQuesNum);
|
|
processFill(subQues, paperDetailUnit, importPaperCheck, subQuesNum, subQuesNum);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1805,7 +1807,6 @@ public class ImportPaperService {
|
|
}
|
|
}
|
|
for (QuestionAudio oldAudio : oldQuestionAudios) {
|
|
for (QuestionAudio oldAudio : oldQuestionAudios) {
|
|
//生成随机数,防止文件重名
|
|
//生成随机数,防止文件重名
|
|
- Random random = new Random();
|
|
|
|
int randomNumber = random.nextInt(1000);
|
|
int randomNumber = random.nextInt(1000);
|
|
//定义文件下载名称,下载音频文件
|
|
//定义文件下载名称,下载音频文件
|
|
String newAudioFileName = newQuestion.getId() + "_" + randomNumber + "_" + oldAudio.getFileName();
|
|
String newAudioFileName = newQuestion.getId() + "_" + randomNumber + "_" + oldAudio.getFileName();
|