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

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

@@ -3,28 +3,11 @@ package com.qmth.cqb.paper.service.export;
 import java.io.File;
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 
-
-
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.xml.bind.JAXBElement;
-
-import org.apache.commons.lang3.StringUtils;
-import org.docx4j.XmlUtils;
-import org.docx4j.jaxb.Context;
-import org.docx4j.wml.Body;
-import org.docx4j.wml.P;
-import org.docx4j.wml.R;
-import org.docx4j.wml.Text;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
@@ -36,8 +19,6 @@ import com.qmth.cqb.paper.dto.PaperExp;
 import com.qmth.cqb.paper.model.ExportStructure;
 import com.qmth.cqb.paper.model.ExtractConfig;
 import com.qmth.cqb.paper.model.QuestionTypeNum;
-import com.qmth.cqb.question.model.QuesOption;
-import com.qmth.cqb.question.model.Question;
 import com.qmth.cqb.utils.CommonUtils;
 import com.qmth.cqb.utils.enums.ExamFileType;
 import com.qmth.cqb.utils.enums.ExportType;

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

@@ -471,9 +471,14 @@ public  class InitPaperExpService {
                                 Text text = (Text)tObj;
                                 String str = text.getValue();
                                 //1
+                                if("##".equals(str.trim())){
+                                	str = "___";
+                                    text.setValue(str);
+                                }
+                                //2
                                 str = str.replaceAll("###","______");
                                 text.setValue(str);
-                                //2
+                                //3
                                 Pattern pattern = Pattern.compile("##\\d{1,}##");
                         		Matcher m = pattern.matcher(str);
                             	while(m.find()){
@@ -483,19 +488,21 @@ public  class InitPaperExpService {
                                     text.setValue(str);
                                     index++;
                             	}
-                            	//3
-                                if(str.startsWith("#") || str.equals("___")){
+                            	//4
+                                /*if(str.startsWith("#") || str.equals("___")){
                                     curMap.put(cur,str);
                                     text.setValue("");
-                                }
-                                //4
+                                }*/
+                                //5
                                 if(str.matches("^\\d{1,}$")){
                                     String preStr = curMap.get(cur - 1);
+                                    int curNum = num + index;
                                     if(!StringUtils.isEmpty(preStr) && preStr.startsWith("#")){
-                                        int curNum = num + index;
                                         text.setValue("___"+(curNum)+"___");
-                                        index++;
+                                    }else{
+                                    	text.setValue(curNum+"");
                                     }
+                                    index++;
                                 }
                                 cur++;
                             }

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

@@ -56,7 +56,7 @@ public class ExportPaperServiceImpl implements ExportPaperService{
 
 	@Override
 	public void exportPaperFile(String paperId,String serviceName,String exportContentList,HttpServletResponse response) throws Exception {
-		ExportPaperAbstractService exportPaperAbstractService = (ExportPaperAbstractService) SpringContextUtils.getBeanById("dzkdExportPaperService");
+		ExportPaperAbstractService exportPaperAbstractService = (ExportPaperAbstractService) SpringContextUtils.getBeanById(serviceName);
 		//根据试卷id查询试卷 
 		Paper paper = paperRepo.findOne(paperId);
 		List<Paper> papers = new ArrayList<Paper>();