xiatian 1 gadu atpakaļ
vecāks
revīzija
6ff991438a

+ 2 - 2
examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/controller/ImportPaperController.java

@@ -89,11 +89,11 @@ public class ImportPaperController extends ControllerSupport {
 		File tempFile = null;
 
 		try {
-			Course course = paper.getCourse();
-			LOG.warn("试卷导入操作!courseCode:{} paperName:{}", course.getCode(), paper.getName());
+			LOG.warn("试卷导入操作!courseCode:{} paperName:{}", paper.getCourseNo() , paper.getName());
 
 			tempFile = importPaperService.getUploadFile(file);
 			Paper newPaper = importPaperService.importPaper(paper, user, tempFile, ud);
+			Course course = paper.getCourse();
 			StringBuilder sb = new StringBuilder();
 			sb.append("课程:" + course.getName() + "(" + course.getCode() + ")");
 			sb.append(" 试卷名称:" + paper.getName());

+ 1 - 1
examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/word/DocxProcessUtil.java

@@ -134,7 +134,7 @@ public final class DocxProcessUtil {
         for (Object obj : tList) {
         	if (obj.getClass().equals(Text.class)) {
 	            Text text = (Text) obj;
-	            returnText += text.getValue().trim();
+	            returnText += text.getValue();
         	}else if(obj.getClass().equals(Br.class)){
         		returnText += "<br/>";
         	}

+ 1 - 1
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/ImportPaperService.java

@@ -1845,7 +1845,7 @@ public class ImportPaperService {
      */
     private static String getContent(String pText, String replaceContent) {
         String word = replaceContent.replace("[", "").replace("]", "");
-        return pText.replaceAll("\\[" + word + "\\]", "").replaceAll("[:|:]", "").trim();
+        return pText.replaceAll("\\[" + word + "\\]", "").replaceAll("[::]", "").trim();
     }
 
     /**