Эх сурвалжийг харах

Merge branch 'dev0410' of https://git.oschina.net/songyue123456/comm-ques-bank.git into dev0410

gaoxing 8 жил өмнө
parent
commit
a3201941db

+ 4 - 1
cqb-paper/src/main/java/com/qmth/cqb/paper/service/ImportPaperService.java

@@ -175,6 +175,7 @@ public class ImportPaperService {
         // 深拷贝临时pkg与最终写入数据库pkg
         tmpWordMlPackage = DocxProcessUtil.getTmpPackage(wordMLPackage);
         writePkg = DocxProcessUtil.getTmpPackage(wordMLPackage);
+        byte[] writeByte = DocxProcessUtil.getPkgByte(writePkg);
 
         // 获取word文档中所有段落
         List<Object> pList = DocxProcessUtil.getAllElementFromObject(wordMLPackage.getMainDocumentPart(), P.class);
@@ -269,7 +270,8 @@ public class ImportPaperService {
                             importPaperCheck, tmpWordMlPackage, false);
                 }
                 // 设置WordMlPackage二进制数据
-                setPkgByte(question, writePkg);
+//                setPkgByte(question, writePkg);
+                question.setQuesPkg(writeByte);
                 // 设置question与Unit集合数据
                 question.setCourseNo(paper.getCourseNo());
                 question.setCourseName(paper.getCourseName());
@@ -294,6 +296,7 @@ public class ImportPaperService {
         wordMLPackage = null;
         tmpWordMlPackage = null;
         writePkg = null;
+        writeByte = null;
         FileUtils.deleteQuietly(file);
         msgMap.put("msg", importPaperCheck.errorInfo);
         msgMap.put("paper", paper);