|
@@ -39,8 +39,6 @@ import org.springframework.util.CollectionUtils;
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
import java.io.*;
|
|
import java.io.*;
|
|
import java.util.*;
|
|
import java.util.*;
|
|
-import java.util.concurrent.ExecutorService;
|
|
|
|
-import java.util.concurrent.Executors;
|
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -204,7 +202,7 @@ public class DataSyncServiceImpl implements DataSyncService {
|
|
return syncStructureData;
|
|
return syncStructureData;
|
|
}).collect(Collectors.toList());
|
|
}).collect(Collectors.toList());
|
|
|
|
|
|
- cloudMarkingTaskUtils.syncPaperStructure(schoolId, examId, subjectCode, false, null, syncSubjectiveStructureDatas);
|
|
|
|
|
|
+ cloudMarkingTaskUtils.syncPaperStructure(schoolId, examId, subjectCode, false, examPaperStructure.getPaperType(), syncSubjectiveStructureDatas);
|
|
}
|
|
}
|
|
|
|
|
|
// 清掉云阅卷主观题答案
|
|
// 清掉云阅卷主观题答案
|
|
@@ -403,7 +401,7 @@ public class DataSyncServiceImpl implements DataSyncService {
|
|
syncStructureData.setAnswer(m.getString("answer"));
|
|
syncStructureData.setAnswer(m.getString("answer"));
|
|
return syncStructureData;
|
|
return syncStructureData;
|
|
}).collect(Collectors.toList());
|
|
}).collect(Collectors.toList());
|
|
- cloudMarkingTaskUtils.syncPaperStructure(schoolId, examId, subjectCode, true, null, syncObjectiveStructureDatas);
|
|
|
|
|
|
+ cloudMarkingTaskUtils.syncPaperStructure(schoolId, examId, subjectCode, true, examPaperStructure.getPaperType(), syncObjectiveStructureDatas);
|
|
}
|
|
}
|
|
|
|
|
|
result = TaskResultEnum.SUCCESS;
|
|
result = TaskResultEnum.SUCCESS;
|