提交使用原卷 BUG

cqb-paper/src/main/java/com/qmth/cqb/paper/service/ExtractConfigService.java

@@ -8,7 +8,6 @@ import javax.servlet.http.HttpServletResponse;
 import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
 
 import com.qmth.cqb.paper.dto.ExportPaperInfoModel;
-import com.qmth.cqb.paper.model.ExamFile;
 import com.qmth.cqb.paper.model.ExtractConfig;
 import com.qmth.cqb.paper.model.Paper;
 
@@ -96,10 +95,4 @@ public interface ExtractConfigService {
 	 */
 	public void exportExamPaperInfo(ExportPaperInfoModel exportModel,HttpServletResponse response)  throws Exception ;
 	
-	/**
-	 * 检查该考试下该课程是否生成试卷文件
-	 * @param examId
-	 * @param courseId
-	 */
-	public List<ExamFile> findPaperStructure(String examId, String courseId);
 }

cqb-paper/src/main/java/com/qmth/cqb/paper/service/PaperService.java

@@ -219,7 +219,7 @@ public class PaperService {
      */
     public Page<Paper> getGenPapers(PaperSearchInfo paperSearchInfo, int curPage, int pageSize) {
         Query query = new Query();
-        query.addCriteria(Criteria.where("paperType").is(PaperType.GENERATE));
+        query.addCriteria(Criteria.where("paperType").is(PaperType.GENERATE.name()));
         if(StringUtils.isNotBlank(paperSearchInfo.getCourseNo())){
         	query.addCriteria(Criteria.where("courseNo").is(paperSearchInfo.getCourseNo()));
         }

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

@@ -718,7 +718,7 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 				FileDisposeUtil.saveUrlAs(downloadUrl+examFile.getFilePath(),downloadDirectory+File.separator+examFile.getFileName());
 			}
 			//创建压缩文件名称
-			String zipFileName = examFiles.get(0).getExamName()+"_"+examFiles.get(0).getExamType().name()+"_"+CommonUtils.getCurNum();
+			String zipFileName = CommonUtils.getCurNum();
 			//将downloadDirectory文件夹压缩成zip文件,存放到zipDirectory文件夹中
 			FileDisposeUtil.fileToZip(downloadDirectory,zipDirectory,zipFileName);
 			//下载zip文件到客户端
@@ -753,14 +753,6 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 		return paperIdList;
 	}
 	
-	@Override
-	public List<ExamFile> findPaperStructure(String examId, String courseId) {
-		ExamFile examFile = new ExamFile();
-		examFile.setExamId(examId);
-		examFile.setCourseId(courseId);
-		return examFileService.findExamFileListByExamFile(examFile);
-	}
-	
 	private void makePaperStructure(String examName,List<String> paperIds,ExportStructure exportStructure) throws Exception{
 		List<QuestionTypeNum> questionTypeNums = exportStructure.getQuestionTypeNums();