音频代码修改

cqb-paper/src/main/java/com/qmth/cqb/paper/model/AudioTimeConfig.java

@@ -47,7 +47,10 @@ public class AudioTimeConfig implements Serializable {
      * 关联题目
      */
     @DBRef
-    private Question question;
+    private PaperDetailUnit paperDetailUnit;
+    
+    private String questionId;
+    
     /**
      * 播放次数
      */
@@ -81,11 +84,14 @@ public class AudioTimeConfig implements Serializable {
 	public void setPaper(Paper paper) {
 		this.paper = paper;
 	}
-	public Question getQuestion() {
-		return question;
+	public PaperDetailUnit getPaperDetailUnit() {
+		return paperDetailUnit;
 	}
-	public void setQuestion(Question question) {
-		this.question = question;
+	public void setPaperDetailUnit(PaperDetailUnit paperDetailUnit) {
+		this.paperDetailUnit = paperDetailUnit;
+		if(paperDetailUnit!=null&&paperDetailUnit.getQuestion()!=null){
+			this.setQuestionId(paperDetailUnit.getQuestion().getId());
+		}
 	}
 	public Integer getPlayTime() {
 		return playTime;
@@ -117,5 +123,12 @@ public class AudioTimeConfig implements Serializable {
 	public void setCourseCode(String courseCode) {
 		this.courseCode = courseCode;
 	}
+	public String getQuestionId() {
+		return questionId;
+	}
+	public void setQuestionId(String questionId) {
+		this.questionId = questionId;
+	}
+	
 }
 

cqb-paper/src/main/java/com/qmth/cqb/paper/service/export/ExportPaperAbstractService.java

@@ -707,7 +707,7 @@ public abstract class ExportPaperAbstractService {
 						audioTime.setCourseCode(computerTestPaper.getCourseCode());
 						audioTime.setExamId(examId);
 						audioTime.setGroupCode(computerTestPaper.getGroupCode());
-						audioTime.setQuestion(paperDetailUnit.getQuestion());
+						audioTime.setPaperDetailUnit(paperDetailUnit);
 						AudioTimeConfig audioTimeConfig = audioTimeConfigRepo.findOne(Example.of(audioTime));
 						if(audioTimeConfig!=null){
 							block.setPlayTime(audioTimeConfig.getPlayTime());

cqb-paper/src/main/java/com/qmth/cqb/paper/service/impl/AudioTimeConfigServiceImpl.java

@@ -82,7 +82,7 @@ public class AudioTimeConfigServiceImpl implements AudioTimeConfigService{
 		    			audioTimeCon.setPaper(paper);
 		    			audioTimeCon.setCourseCode(audioTimeConfig.getCourseCode());
 		    			quesService.formatQues(paperDetailUnit.getQuestion());
-		    			audioTimeCon.setQuestion(audioTimeConfig.getQuestion());
+		    			audioTimeCon.setPaperDetailUnit(paperDetailUnit);
 		    			audioTimeConfigList.add(audioTimeCon);
 		    		}
 		    	}
@@ -102,7 +102,7 @@ public class AudioTimeConfigServiceImpl implements AudioTimeConfigService{
 	public List<AudioTimeConfig> findAudioTimeConfigByExamId(String examId,String courseCode) {
 		List<AudioTimeConfig> list = audioTimeConfigRepo.findByExamIdAndCourseCode(examId,courseCode);
 		for(AudioTimeConfig audioTimeConfig : list){
-			quesService.formatQues(audioTimeConfig.getQuestion());
+			quesService.formatQues(audioTimeConfig.getPaperDetailUnit().getQuestion());
 		}
 		return list;
 	}
@@ -131,7 +131,7 @@ public class AudioTimeConfigServiceImpl implements AudioTimeConfigService{
 		audioTime.setCourseCode(courseCode);
 		audioTime.setExamId(examId);
 		audioTime.setGroupCode(groupCode);
-		audioTime.setQuestion(paperDetailUnit.getQuestion());
+		audioTime.setPaperDetailUnit(paperDetailUnit);
 		AudioTimeConfig audioTimeConfig = audioTimeConfigRepo.findOne(Example.of(audioTime));
 	    if(audioTimeConfig == null){
 	    	map.put("errMessage", "音频次数未设置");

cqb-paper/src/main/java/com/qmth/cqb/paper/service/impl/ExtractConfigServiceImpl.java

@@ -596,7 +596,7 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 			audioTimeCon.setExamId(examId);
 			audioTimeCon.setCourseCode(courseCode);
 			audioTimeCon.setGroupCode(groupCode);
-			audioTimeCon.setQuestion(paperDetailUnit.getQuestion());
+			audioTimeCon.setQuestionId(paperDetailUnit.getQuestion().getId());
 			AudioTimeConfig audioTimeConfig = audioTimeConfigRepo.findOne(Example.of(audioTimeCon));
 			if(audioTimeConfig != null && audioTimeConfig.getPlayTime() != null){
 				questionDto.setPlayTime(audioTimeConfig.getPlayTime());

cqb-starter/src/test/java/com/qmth/cqb/ExtractConfigServiceTest.java

@@ -152,8 +152,11 @@ public class ExtractConfigServiceTest {
 	@Test
 	public void testGetQuestionById(){
 		//String paperDetailUnitId = "597ae94dcb3e061584127df0";
+		String examId = "67";
 		String paperDetailUnitId = "599663e981c6443284d7dc48";
-		QuestionDto dto = extractConfigService.extractExamQuestion(paperDetailUnitId);
+		String courseCode = "000008";
+		String groupCode = "A";
+		QuestionDto dto = extractConfigService.extractExamQuestion(examId,courseCode,groupCode,paperDetailUnitId);
 		System.out.println(dto.getQuesAnswer());
 	}