|
@@ -998,7 +998,7 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
|
|
//获取选项
|
|
//获取选项
|
|
List<QuesOptionDto> quesOptionDtos = paperDetailUnitDto.getQuesOptions();
|
|
List<QuesOptionDto> quesOptionDtos = paperDetailUnitDto.getQuesOptions();
|
|
//添加题干
|
|
//添加题干
|
|
- body = startWithP(paperDetailUnitDto.getQuesBody(), paperDetailUnitDto.getNumber(),false);
|
|
|
|
|
|
+ body = startWithP(body, paperDetailUnitDto.getNumber(),false);
|
|
answerHtml.append(body);
|
|
answerHtml.append(body);
|
|
//添加选项
|
|
//添加选项
|
|
for(QuesOptionDto quesOptionDto:quesOptionDtos){
|
|
for(QuesOptionDto quesOptionDto:quesOptionDtos){
|
|
@@ -1011,8 +1011,10 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
|
|
//7.如果为套题
|
|
//7.如果为套题
|
|
else if(paperDetailUnitDto.getSubQuestions()!=null && paperDetailUnitDto.getSubQuestions().size()>0){
|
|
else if(paperDetailUnitDto.getSubQuestions()!=null && paperDetailUnitDto.getSubQuestions().size()>0){
|
|
//添加主题干
|
|
//添加主题干
|
|
- String BigBody = startWithP(paperDetailUnitDto.getQuesBody(),-2,false);
|
|
|
|
- answerHtml.append(BigBody);
|
|
|
|
|
|
+ String bigBody = CommonUtils.relaceQuestionIdx(paperDetailUnitDto.getQuesBody(), 0);
|
|
|
|
+ bigBody = bigBody.replaceAll("<span>", "").replaceAll("</span>", "").replaceAll("###","___");
|
|
|
|
+ bigBody = startWithP(bigBody,-2,false);
|
|
|
|
+ answerHtml.append(bigBody);
|
|
List<SubQuestionDto> subQuestionDtos = paperDetailUnitDto.getSubQuestions();
|
|
List<SubQuestionDto> subQuestionDtos = paperDetailUnitDto.getSubQuestions();
|
|
for(SubQuestionDto subQuestionDto:subQuestionDtos){
|
|
for(SubQuestionDto subQuestionDto:subQuestionDtos){
|
|
body = subQuestionDto.getQuesBody().replaceAll("<span>", "").replaceAll("</span>", "").replaceAll("###","___");
|
|
body = subQuestionDto.getQuesBody().replaceAll("<span>", "").replaceAll("</span>", "").replaceAll("###","___");
|