chenken 7 лет назад
Родитель
Сommit
f40f308778

+ 8 - 0
cqb-paper/src/main/java/com/qmth/cqb/paper/service/export/DzkdExportPaperService.java

@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Set;
 
 
+
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
@@ -16,6 +17,7 @@ import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
 import com.qmth.cqb.paper.dto.PaperDetailExp;
 import com.qmth.cqb.paper.dto.PaperDetailUnitExp;
 import com.qmth.cqb.paper.dto.PaperExp;
+import com.qmth.cqb.paper.model.ExamFile;
 import com.qmth.cqb.paper.model.ExportStructure;
 import com.qmth.cqb.paper.model.ExtractConfig;
 import com.qmth.cqb.paper.model.QuestionTypeNum;
@@ -236,6 +238,12 @@ public class DzkdExportPaperService extends ExportPaperAbstractService {
     	setSplitPaperDetailExp(paperExp,paperExp.getPaperDetails());
         if (paperExp!=null) {
         	String currNum = CommonUtils.getCurNum();
+        	//删除原有试卷文件
+        	ExamFile examFile = new ExamFile();
+        	examFile.setExamId(extractConfig.getExamId()+"");
+        	examFile.setCourseId(extractConfig.getCourseCode());
+        	examFile.setOrgId(extractConfig.getOrgId());
+        	examFileService.deleteExamFile(examFile);
         	//没有试卷结构导出设置
         	if(exportStructure==null){
         		//上传试卷

+ 8 - 0
cqb-paper/src/main/java/com/qmth/cqb/paper/service/export/SydxExportPaperService.java

@@ -5,6 +5,7 @@ import java.util.Collections;
 import java.util.List;
 
 
+
 import org.apache.commons.lang3.StringUtils;
 import org.docx4j.XmlUtils;
 import org.docx4j.jaxb.Context;
@@ -25,6 +26,7 @@ import com.qmth.cqb.paper.dao.PaperRepo;
 import com.qmth.cqb.paper.dto.PaperDetailExp;
 import com.qmth.cqb.paper.dto.PaperDetailUnitExp;
 import com.qmth.cqb.paper.dto.PaperExp;
+import com.qmth.cqb.paper.model.ExamFile;
 import com.qmth.cqb.paper.model.ExportStructure;
 import com.qmth.cqb.paper.model.ExtractConfig;
 import com.qmth.cqb.paper.model.Paper;
@@ -107,6 +109,12 @@ public class SydxExportPaperService extends ExportPaperAbstractService{
     	PaperExp exportPaperStructureExp = initExportSydxPaper(paperId);
         if (exportPaperExp!=null&&exportPaperStructureExp!=null) {
         	String currNum = CommonUtils.getCurNum();
+        	//删除原有试卷文件
+        	ExamFile examFile = new ExamFile();
+        	examFile.setExamId(extractConfig.getExamId()+"");
+        	examFile.setCourseId(extractConfig.getCourseCode());
+        	examFile.setOrgId(extractConfig.getOrgId());
+        	examFileService.deleteExamFile(examFile);
         	//没有试卷结构导出设置
         	if(exportStructure==null){
         		//上传试卷