PaperExp.java 添加course字段

cqb-paper/src/main/java/com/qmth/cqb/paper/dto/PaperExp.java

@@ -1,12 +1,10 @@
 package com.qmth.cqb.paper.dto;
 
+import com.qmth.cqb.base.model.Course;
 import com.qmth.cqb.utils.enums.PaperStatus;
 import com.qmth.cqb.utils.enums.PaperType;
 
-import cn.com.qmth.examcloud.common.dto.core.enums.CourseLevel;
-
 import java.io.Serializable;
-import java.util.Map;
 import java.util.*;
 
 /**
@@ -33,6 +31,8 @@ public class PaperExp implements Serializable{
     private String courseNo;
 
     private String courseName;
+    
+    private Course course;
 
     private List<PaperDetailExp> paperDetails;
 
@@ -193,6 +193,12 @@ public class PaperExp implements Serializable{
 		this.courseLevel = courseLevel;
 	}
 
-	
+	public Course getCourse() {
+		return course;
+	}
+
+	public void setCourse(Course course) {
+		this.course = course;
+	}
     
 }

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

@@ -449,6 +449,7 @@ public class PaperService {
         Paper paper = paperRepo.findOne(id);
         // 创建paperDto
         PaperExp paperExp = BeanCopierUtil.copyProperties(paper, PaperExp.class);
+        paperExp.setCourse(paper.getCourse());
         // 获取大题
         List<PaperDetail> paperDetails = paperDetailRepo.findByPaper(paper);
         List<PaperDetailExp> paperDetailExps = BeanCopierUtil.copyPropertiesOfList(paperDetails, PaperDetailExp.class);

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

@@ -846,7 +846,7 @@ public abstract class ExportPaperAbstractService {
 			DocxProcessUtil.exportWord(paperExp,paperfileName,template);
 			DocxProcessUtil.processImage(paperfileName,getPkgList(paperExp.getId()));
 			File file  = new File(TEMP_FILE_EXP+paperfileName);
-			String paperFilePath = uploadUrl+extractConfig.getOrgId()+"/"+paperfileName;
+			String paperFilePath = uploadUrl+extractConfig.getOrgId()+File.separator+paperfileName;
             UpYun upyun = new UpYun(bucketName,userName,password);
 			upyun.writeFile(paperFilePath,file,true);
 			examFileService.saveExamFile(new ExamFile(extractConfig,paperFilePath,examFileType,DOCX_SUFFIX),accessUser);
@@ -885,7 +885,7 @@ public abstract class ExportPaperAbstractService {
 			File file = new File(TEMP_FILE_EXP+objectiveFilename);
 			FileOutputStream out = new FileOutputStream(file);
 			objectiveExcelExporter.write(objectiveFilename,objectiveQuestionStructureList,out);
-			String objectiveFilePath = uploadUrl+extractConfig.getOrgId()+"/"+objectiveFilename;
+			String objectiveFilePath = uploadUrl+extractConfig.getOrgId()+File.separator+objectiveFilename;
             UpYun upyun = new UpYun(bucketName,userName,password);
 			upyun.writeFile(objectiveFilePath,file,true);
 			examFileService.saveExamFile(new ExamFile(extractConfig,objectiveFilePath,ExamFileType.PAPER_STRUCTURE_OBJECTIVE,EXCEL_SUFFIX),accessUser);
@@ -972,7 +972,7 @@ public abstract class ExportPaperAbstractService {
 			File file = new File(TEMP_FILE_EXP+subjectiveFileName);
 			FileOutputStream out = new FileOutputStream(file);
 			subjectiveExcelExporter.write(subjectiveFileName,subjectiveQuestionStructureList,out);
-			String subjectiveFilePath = uploadUrl+extractConfig.getOrgId()+"/"+subjectiveFileName;
+			String subjectiveFilePath = uploadUrl+extractConfig.getOrgId()+File.separator+subjectiveFileName;
             UpYun upyun = new UpYun(bucketName,userName,password);
 			upyun.writeFile(subjectiveFilePath,file,true);
 			examFileService.saveExamFile(new ExamFile(extractConfig,subjectiveFilePath,ExamFileType.PAPER_STRUCTURE_SUBJECTIVE,EXCEL_SUFFIX),accessUser);