|
@@ -154,7 +154,7 @@ public class SxsfExportPaperService extends ExportPaperAbstractService {
|
|
PaperExp paperExp = (PaperExp) dataMap.get("paper");
|
|
PaperExp paperExp = (PaperExp) dataMap.get("paper");
|
|
List<PaperDetailExp> objectiveDetails = paperExp.getObjectiveDetails();
|
|
List<PaperDetailExp> objectiveDetails = paperExp.getObjectiveDetails();
|
|
//根据试卷结构导出设置中的数量补齐客观题
|
|
//根据试卷结构导出设置中的数量补齐客观题
|
|
- fillObjectiveDetails(objectiveDetails,questionTypeNums);
|
|
|
|
|
|
+ fillObjectiveQuestions(objectiveDetails,questionTypeNums);
|
|
List<ObjectiveQuestionStructure> objectiveQuestionStructureList = new ArrayList<ObjectiveQuestionStructure>();
|
|
List<ObjectiveQuestionStructure> objectiveQuestionStructureList = new ArrayList<ObjectiveQuestionStructure>();
|
|
for(PaperDetailExp paperDetailExp:objectiveDetails){
|
|
for(PaperDetailExp paperDetailExp:objectiveDetails){
|
|
for(PaperDetailUnitExp unit:paperDetailExp.getPaperDetailUnits()){
|
|
for(PaperDetailUnitExp unit:paperDetailExp.getPaperDetailUnits()){
|
|
@@ -187,7 +187,7 @@ public class SxsfExportPaperService extends ExportPaperAbstractService {
|
|
* @param objectiveDetails
|
|
* @param objectiveDetails
|
|
* @param questionTypeNums
|
|
* @param questionTypeNums
|
|
*/
|
|
*/
|
|
- public void fillObjectiveDetails(List<PaperDetailExp> objectiveDetails,List<QuestionTypeNum> questionTypeNums) {
|
|
|
|
|
|
+ public void fillObjectiveQuestions(List<PaperDetailExp> objectiveDetails,List<QuestionTypeNum> questionTypeNums) {
|
|
for(PaperDetailExp paperDetailExp:objectiveDetails){
|
|
for(PaperDetailExp paperDetailExp:objectiveDetails){
|
|
List<PaperDetailUnitExp> paperDetailUnits = paperDetailExp.getPaperDetailUnits();
|
|
List<PaperDetailUnitExp> paperDetailUnits = paperDetailExp.getPaperDetailUnits();
|
|
//1.将大题中的小题排序
|
|
//1.将大题中的小题排序
|