提交调卷规则BUG

cqb-comm-utils/src/main/java/com/qmth/cqb/utils/word/DocxProcessUtil.java

@@ -259,13 +259,12 @@ public final class DocxProcessUtil {
         htmlSettings.setWmlPackage(wordMLPackage);
         String tmpHtmlPath = TEMP_FILE_IMP + UUID.randomUUID().toString() + ".html";
         File tmpHtml = new File(tmpHtmlPath);
-        OutputStream os = new java.io.FileOutputStream(tmpHtml);
+        OutputStream os = new FileOutputStream(tmpHtml);
         Docx4J.toHTML(htmlSettings, os, Docx4J.FLAG_EXPORT_PREFER_XSL);
         os.flush();
-
+        os.close();
         // 格式化html代码
         String htmlStr = formatHtmlByPath(tmpHtmlPath);
-
         // 删除临时html文件
         FileUtils.deleteQuietly(tmpHtml);
 

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

@@ -304,6 +304,9 @@ public abstract class ExportPaperAbstractService {
 		List<PaperDetailUnitExp> paperDetailUnitExps = paperDetailExp.getPaperDetailUnits();
 		Set<Double> scoreSet = new HashSet<Double>();
 		for (PaperDetailUnitExp unitExp : paperDetailUnitExps) {
+			if(unitExp.getQuestionType()==QuesStructType.NESTED_ANSWER_QUESTION){
+				return false;
+			}
 			scoreSet.add(unitExp.getScore());
 		}
 		return scoreSet.size() == 1;

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

@@ -285,15 +285,9 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 							        				 extractConfig.getScrambling_the_option_order());
         	finishedPaperIdMap.put(key, newPaper.getId());
         }
-        /**
-         * 设置map，并保存调卷规则
-         * 如果已经设置过了，就不再设置
-         */
-        if(extractConfig.getIfFinish()==null||extractConfig.getIfFinish()==0){
-        	extractConfig.setFinishedPaperIdMap(finishedPaperIdMap);
-        	extractConfig.setIfFinish((short)1);
-        	extractConfigRepo.save(extractConfig);
-        }
+    	extractConfig.setFinishedPaperIdMap(finishedPaperIdMap);
+    	extractConfig.setIfFinish((short)1);
+    	extractConfigRepo.save(extractConfig);
         return finishedPaperIdMap;
 	}