解决电子科大，在调卷规则改变试卷之后，导出的仍然是之前试卷的BUG

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

@@ -3,12 +3,12 @@ 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 org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
@@ -21,6 +21,7 @@ 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;
+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;
@@ -60,6 +61,57 @@ public class DzkdExportPaperService extends ExportPaperAbstractService {
 		}
 	}
 	
+	/**
+     * 小题排序
+     * @describle 大题排序完成之后，放在一个集合里面。然后对相同类型的大题分组，生成不同的结合，在对小题进行
+     * @param paperDetailExps
+     */
+	@Override
+	public void sortPaperDetailUnitExps(List<PaperDetailExp> paperDetailExps) {
+    	Map<Long,List<PaperDetailUnitExp>> map = new HashMap<Long, List<PaperDetailUnitExp>>();
+    	//循环所有大题,将同类型的小题放到同一个集合下面
+    	int index = 0;
+    	for(PaperDetailExp paperDetailExp:paperDetailExps){
+    		List<PaperDetailUnitExp> paperDetailUnitExps = null;
+    		//单选，多选，判断放在同一集合下排序
+    		if(paperDetailExp.getSortNumber()<5L){
+    			//通过map的key去取value，如果没有，就添加
+        		if(map.get(paperDetailExp.getSortNumber()) == null){
+        			paperDetailUnitExps = new ArrayList<PaperDetailUnitExp>();
+        		}else {
+    				paperDetailUnitExps = map.get(paperDetailExp.getSortNumber());
+    			}
+        		paperDetailUnitExps.addAll(paperDetailExp.getPaperDetailUnits());
+        		map.put(paperDetailExp.getSortNumber(), paperDetailUnitExps);
+    		}else {
+    			paperDetailUnitExps = new ArrayList<PaperDetailUnitExp>();
+    			paperDetailUnitExps.addAll(paperDetailExp.getPaperDetailUnits());
+    			map.put(paperDetailExp.getSortNumber() + index, paperDetailUnitExps);
+    			index++;
+			}
+    	}
+    	//循环所有小题，给小题排序
+    	for(Long sortNumber:map.keySet()){
+    		List<PaperDetailUnitExp> paperDetailUnitExps = map.get(sortNumber);
+    		int number = 1;
+    		if(paperDetailUnitExps != null && paperDetailUnitExps.size()>0){
+    			for(int i = 0;i<paperDetailUnitExps.size();i++){
+    				PaperDetailUnitExp paperDetailUnitExp = paperDetailUnitExps.get(i);
+    				if(paperDetailUnitExp.getQuestionType() == QuesStructType.NESTED_ANSWER_QUESTION){
+    					List<Question> subQuestions = paperDetailUnitExp.getQuestion().getSubQuestions();
+    					for(int j = 0;j<subQuestions.size();j++){
+    						subQuestions.get(j).setNumber(number+j);
+    					}
+    					number += subQuestions.size();
+    				}else {
+    					paperDetailUnitExp.setNumber(number);
+    					number++;
+					}
+        		}
+    		}
+    	}
+	}
+	
 	/**
 	 * 设置大题标题,并将大题分类  主观题    客观题
 	 * @param paperDetailExps
@@ -99,7 +151,7 @@ public class DzkdExportPaperService extends ExportPaperAbstractService {
 				questionScore = checkPaperDetailUnitblanksScore(paperDetailExp);
 				scoreString = questionScore==null?"":"每空"+questionScore+"分，";
 				title = "（本大题共" + blanksNumbers + "个空格，将每空答在答题卡 “" + String.valueOf(firstBlank + 1)
-						+ "——" + String.valueOf(lastBlank) + "”相应的序号上。"+ scoreString + "共" + totalScore+ "分。)";
+						+ "—" + String.valueOf(lastBlank) + "”相应的序号上。"+ scoreString + "共" + totalScore+ "分。)";
 				firstBlank = lastBlank;
 			} else {
 				paperDetailExp.setName(type.getName());

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

@@ -6,15 +6,28 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 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 java.util.stream.Collectors;
 
+import javax.xml.bind.JAXBElement;
+
 import main.java.com.UpYun;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.docx4j.XmlUtils;
+import org.docx4j.jaxb.Context;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
+import org.docx4j.wml.Body;
+import org.docx4j.wml.P;
+import org.docx4j.wml.R;
+import org.docx4j.wml.Text;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Example;
@@ -51,6 +64,7 @@ import com.qmth.cqb.paper.service.ExamFileService;
 import com.qmth.cqb.paper.service.PaperDetailService;
 import com.qmth.cqb.paper.service.PaperService;
 import com.qmth.cqb.question.dao.QuesRepo;
+import com.qmth.cqb.question.model.QuesOption;
 import com.qmth.cqb.question.model.Question;
 import com.qmth.cqb.question.model.QuestionAudio;
 import com.qmth.cqb.question.service.QuestionAudioService;
@@ -235,10 +249,317 @@ public abstract class ExportPaperAbstractService {
     
     public PaperExp initPaperExp(String paperId) throws Exception{
     	PaperExp paperExp = initPaperExpService.initPaperExp(paperId);
+    	//给新的大题下所有小题排序
+    	sortPaperDetailUnitExps(paperExp.getPaperDetails());
+    	//如果每个小题分数不一样，题干后面添加分数
+    	appendScoreToQuestionBody(paperExp.getPaperDetails());
+    	//给每个小题选项排序
+    	setUnitExpNumber(paperExp.getPaperDetails());
     	setExpDtoTitle(paperExp.getPaperDetails());
     	return paperExp;
     }
     
+    /**
+     * 设置选项号
+     * @param optionWordMl
+     * @param num
+     * @return
+     * @throws Exception
+     */
+    public String setOptionNum(String optionWordMl,String num) throws Exception {
+        String tmpStr = DocxProcessUtil.BODY_HEADER + optionWordMl + DocxProcessUtil.BODY_TAIL;
+        Body body = (Body)XmlUtils.unmarshalString(tmpStr,Context.jc,Body.class);
+        List<Object> pList = body.getContent();
+        int index = 0;
+        for(Object pObj:pList){
+            if(index > 0){
+                break;
+            }
+            P p = (P) pObj;
+            List<Object> pContent = p.getContent();
+            R run = new R();
+            Text text = new Text();
+            text.setValue(num+". ");
+            run.getContent().add(text);
+            pContent.add(0,run);
+            index++;
+        }
+        StringBuffer pWordMl = new StringBuffer();
+        for(Object pObj:pList){
+            if(pObj instanceof P){
+                pWordMl.append(DocxProcessUtil.formatPWordMl(XmlUtils.marshaltoString(pObj)));
+            }
+        }
+        return pWordMl.toString();
+    }
+    
+    /**
+   	 * 将数字1,2,3,4转化成A,B,C,D
+   	 * @param number
+   	 * @return
+   	 */
+       public String getOptionNum(int number){
+           char optionNum = (char)(65 + number);
+           return String.valueOf(optionNum);
+       }
+    
+    /**
+     * 替换填空
+     * 将###替换为下划线_______
+     * @param wordMl
+     * @param num
+     * @return
+     * @throws Exception
+     */
+	public String replaceQuesBlank(String wordMl,int num) throws Exception {
+        String tmpStr = DocxProcessUtil.BODY_HEADER + wordMl + DocxProcessUtil.BODY_TAIL;
+        Body body = (Body)XmlUtils.unmarshalString(tmpStr,Context.jc,Body.class);
+        List<Object> pList = body.getContent();
+        int index = 0;
+        int cur = 0;
+        Map<Integer,String> curMap = new HashMap<Integer,String>();
+        for(Object pObj:pList){
+            if(pObj.getClass().equals(P.class)){
+                List<Object> pContent = ((P)pObj).getContent();
+                for(Object rObj:pContent){
+                    if(rObj.getClass().equals(R.class)){
+                        List<Object> rContent = ((R)rObj).getContent();
+                        for(Object tObj:rContent){
+                            if (tObj instanceof JAXBElement)
+                                tObj = ((JAXBElement<?>) tObj).getValue();
+                            if(tObj.getClass().equals(Text.class)){
+                                Text text = (Text)tObj;
+                                String str = text.getValue();
+                                //1
+                                str = str.replaceAll("###","______");
+                                text.setValue(str);
+                                //2
+                                Pattern pattern = Pattern.compile("##\\d{1,}##");
+                        		Matcher m = pattern.matcher(str);
+                            	while(m.find()){
+                            		int curNum = num + index;
+                                    String a = m.group();
+                                    str = str.replaceAll(a, "___"+(curNum)+"___");
+                                    text.setValue(str);
+                                    index++;
+                            	}
+                            	//3
+                                if(str.startsWith("#") || str.equals("___")){
+                                    curMap.put(cur,str);
+                                    text.setValue("");
+                                }
+                                //4
+                                if(str.matches("^\\d{1,}$")){
+                                    String preStr = curMap.get(cur - 1);
+                                    if(!StringUtils.isEmpty(preStr) && preStr.startsWith("#")){
+                                        int curNum = num + index;
+                                        text.setValue("___"+(curNum)+"___");
+                                        index++;
+                                    }
+                                }
+                                cur++;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        StringBuffer pWordMl = new StringBuffer();
+        for(Object pObj:pList){
+            if(pObj instanceof P){
+                pWordMl.append(DocxProcessUtil.formatPWordMl(XmlUtils.marshaltoString(pObj)));
+            }
+        }
+        return pWordMl.toString();
+    }
+	
+	/**
+     * 设置题号
+     * @param quesBodyWordMl
+     * @param num
+     * @return
+     * @throws Exception
+     */
+    public String setSubQuesNum(String quesBodyWordMl,int num) throws Exception {
+        String tmpStr = DocxProcessUtil.BODY_HEADER + quesBodyWordMl + DocxProcessUtil.BODY_TAIL;
+        Body body = (Body)XmlUtils.unmarshalString(tmpStr,Context.jc,Body.class);
+        List<Object> pList = body.getContent();
+        int index = 0;
+        for(Object pObj:pList){
+            if(index > 0){
+                break;
+            }
+            P p = (P) pObj;
+            List<Object> pContent = p.getContent();
+            R run = new R();
+            Text text = new Text();
+            text.setValue(num+". ");
+            run.getContent().add(text);
+            pContent.add(0,run);
+            index++;
+        }
+        StringBuffer pWordMl = new StringBuffer();
+        for(Object pObj:pList){
+            if(pObj instanceof P){
+                pWordMl.append(DocxProcessUtil.formatPWordMl(XmlUtils.marshaltoString(pObj)));
+            }
+        }
+        return pWordMl.toString();
+    }
+    
+    /**
+	 * 给小题选项进行排序
+	 * @param paperDetails
+	 * @param startIndxt
+	 * @throws Exception
+	 */
+	public void setUnitExpNumber(List<PaperDetailExp> paperDetails) throws Exception {
+		for (PaperDetailExp paperDetail : paperDetails) {
+			List<PaperDetailUnitExp> paperDetailUnitExpList = paperDetail.getPaperDetailUnits();
+			for (PaperDetailUnitExp paperDetailUnit:paperDetailUnitExpList) {
+				List<QuesOption> optionList = paperDetailUnit.getQuestion().getQuesOptions();
+				if (optionList != null && optionList.size() > 0) {
+					int index = 0;
+					for (QuesOption quesOption : optionList) {
+						quesOption.setOptionBodyWord(setOptionNum(quesOption.getOptionBodyWord(),getOptionNum(index)));
+						index++;
+					}
+				}
+				List<Question> subQuesList = paperDetailUnit.getQuestion().getSubQuestions();
+				Question question = paperDetailUnit.getQuestion();
+				// 套题序号
+				if (subQuesList != null && subQuesList.size() > 0) {
+					question.setQuesBodyWord(replaceQuesBlank(question.getQuesBodyWord(),subQuesList.get(0).getNumber()));
+					for (Question subQues : subQuesList) {
+						subQues.setQuesBodyWord(setSubQuesNum(subQues.getQuesBodyWord(),subQues.getNumber()));
+						subQues.setQuesAnswerWord(setSubQuesNum(subQues.getQuesAnswerWord(),subQues.getNumber()));
+						subQues.setQuesBodyWord(replaceQuesBlank(subQues.getQuesBodyWord(),subQues.getNumber()));
+						List<QuesOption> subOptionList = subQues.getQuesOptions();
+						if (subOptionList != null && subOptionList.size() > 0) {
+							int sub_index = 0;
+							for (QuesOption quesOption : subOptionList) {
+								quesOption.setOptionBodyWord(setOptionNum(quesOption.getOptionBodyWord(),getOptionNum(sub_index)));
+								sub_index++;
+							}
+						}
+					}
+				} else {
+					question.setQuesBodyWord(setSubQuesNum(question.getQuesBodyWord(), paperDetailUnit.getNumber()));
+					question.setQuesAnswerWord(setSubQuesNum(question.getQuesAnswerWord(),paperDetailUnit.getNumber()));
+					question.setQuesBodyWord(replaceQuesBlank(question.getQuesBodyWord(),paperDetailUnit.getNumber()));
+				}
+			}
+		}
+	}
+	
+    /**
+     * 在题干上设置分数
+     * @throws Exception 
+     */
+    public String appendScoreToQuestionBody(String quesBodyWordMl,double score) throws Exception{
+    	String tmpStr = DocxProcessUtil.BODY_HEADER + quesBodyWordMl + DocxProcessUtil.BODY_TAIL;
+        Body body = (Body)XmlUtils.unmarshalString(tmpStr,Context.jc,Body.class);
+        List<Object> pList = body.getContent();
+        int index = 0;
+        for(Object pObj:pList){
+            if(index < pList.size()-1){
+                break;
+            }
+            P p = (P) pObj;
+            List<Object> pContent = p.getContent();
+            R run = new R();
+            Text text = new Text();
+            text.setValue("("+score+"分)");
+            run.getContent().add(text);
+            pContent.add(run);
+            index++;
+        }
+        StringBuffer pWordMl = new StringBuffer();
+        for(Object pObj:pList){
+            if(pObj instanceof P){
+                pWordMl.append(DocxProcessUtil.formatPWordMl(XmlUtils.marshaltoString(pObj)));
+            }
+        }
+        return pWordMl.toString();
+    }
+    
+    /**
+     * 当大题下小题分数不是全部一样时，在小题题干后面加上小题的分数
+     * @param details
+     * @throws Exception
+     */
+    public void appendScoreToQuestionBody(List<PaperDetailExp> details) throws Exception{
+    	for(PaperDetailExp paperDetailExp:details){
+    		if(checkPaperDetailUnitScore(paperDetailExp)==null){
+    			for(PaperDetailUnitExp paperDetailUnit:paperDetailExp.getPaperDetailUnits()){
+    				//判断小题是否为套题
+    				if(paperDetailUnit.getQuestionType() == QuesStructType.NESTED_ANSWER_QUESTION){
+    					List<Question> subQuestions = paperDetailUnit.getQuestion().getSubQuestions();
+    					for(Question subQuestion:subQuestions){
+    						String questionBodyWord = appendScoreToQuestionBody(subQuestion.getQuesBodyWord(),subQuestion.getScore());
+    						subQuestion.setQuesBodyWord(questionBodyWord);
+    					}
+    				}else {
+    					Question question = paperDetailUnit.getQuestion();
+        				String questionBodyWord = appendScoreToQuestionBody(question.getQuesBodyWord(),paperDetailUnit.getScore());
+        				question.setQuesBodyWord(questionBodyWord);
+					}
+    			}
+    		}
+    	}
+    }
+    
+    /**
+     * 小题排序
+     * @describle 大题排序完成之后，放在一个集合里面。然后对相同类型的大题分组，生成不同的结合，在对小题进行
+     * @param paperDetailExps
+     */
+    public void sortPaperDetailUnitExps(List<PaperDetailExp> paperDetailExps) {
+    	Map<Long,List<PaperDetailUnitExp>> map = new HashMap<Long, List<PaperDetailUnitExp>>();
+    	//循环所有大题,将同类型的小题放到同一个集合下面
+    	int index = 0;
+    	for(PaperDetailExp paperDetailExp:paperDetailExps){
+    		List<PaperDetailUnitExp> paperDetailUnitExps = null;
+    		//单选，多选，判断放在同一集合下排序
+    		if(paperDetailExp.getSortNumber()<4L){
+    			//通过map的key去取value，如果没有，就添加
+        		if(map.get(paperDetailExp.getSortNumber()) == null){
+        			paperDetailUnitExps = new ArrayList<PaperDetailUnitExp>();
+        		}else {
+    				paperDetailUnitExps = map.get(paperDetailExp.getSortNumber());
+    			}
+        		paperDetailUnitExps.addAll(paperDetailExp.getPaperDetailUnits());
+        		map.put(paperDetailExp.getSortNumber(), paperDetailUnitExps);
+    		}else {
+    			paperDetailUnitExps = new ArrayList<PaperDetailUnitExp>();
+    			paperDetailUnitExps.addAll(paperDetailExp.getPaperDetailUnits());
+    			map.put(paperDetailExp.getSortNumber() + index, paperDetailUnitExps);
+    			index++;
+			}
+    	}
+    	//循环所有小题，给小题排序
+    	for(Long sortNumber:map.keySet()){
+    		List<PaperDetailUnitExp> paperDetailUnitExps = map.get(sortNumber);
+    		int number = 1;
+    		if(paperDetailUnitExps != null && paperDetailUnitExps.size()>0){
+    			for(int i = 0;i<paperDetailUnitExps.size();i++){
+    				PaperDetailUnitExp paperDetailUnitExp = paperDetailUnitExps.get(i);
+    				if(paperDetailUnitExp.getQuestionType() == QuesStructType.NESTED_ANSWER_QUESTION){
+    					List<Question> subQuestions = paperDetailUnitExp.getQuestion().getSubQuestions();
+    					for(int j = 0;j<subQuestions.size();j++){
+    						subQuestions.get(j).setNumber(number+j);
+    					}
+    					number += subQuestions.size();
+    				}else {
+    					paperDetailUnitExp.setNumber(number);
+    					number++;
+					}
+        		}
+    		}
+    	}
+	}
+
+    
     /**
    	 * 设置大题标题
    	 * @param paperDetailExps

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

@@ -41,7 +41,6 @@ import com.qmth.cqb.paper.service.ExamFileService;
 import com.qmth.cqb.paper.service.PaperDetailService;
 import com.qmth.cqb.paper.service.PaperService;
 import com.qmth.cqb.question.dao.QuesRepo;
-import com.qmth.cqb.question.model.QuesOption;
 import com.qmth.cqb.question.model.Question;
 import com.qmth.cqb.question.service.QuestionAudioService;
 import com.qmth.cqb.utils.BeanCopierUtil;
@@ -143,12 +142,6 @@ public  class InitPaperExpService {
     	sortPaperDetailExps(paperDetailExps);
     	//给新的大题添加分数
     	scorePaperDetailExps(paperDetailExps);
-    	//给新的大题下所有小题排序
-    	sortPaperDetailUnitExps(paperDetailExps);
-    	//如果每个小题分数不一样，题干后面添加分数
-    	appendScoreToQuestionBody(paperDetailExps);
-    	//给每个小题选项排序
-    	setUnitExpNumber(paperDetailExps);
     	paperExpDto.setPaperDetails(paperDetailExps);
     	return paperExpDto;
     }
@@ -272,49 +265,6 @@ public  class InitPaperExpService {
 		}
 	}
     
-    /**
-     * 小题排序
-     * @describle 大题排序完成之后，放在一个集合里面。然后对相同类型的大题分组，生成不同的结合，在对小题进行
-     * @param paperDetailExps
-     */
-    private void sortPaperDetailUnitExps(List<PaperDetailExp> paperDetailExps) {
-    	Map<Long,List<PaperDetailUnitExp>> map = new HashMap<Long, List<PaperDetailUnitExp>>();
-    	//循环所有大题,将同类型的小题放到同一个集合下面
-    	for(PaperDetailExp paperDetailExp:paperDetailExps){
-    		List<PaperDetailUnitExp> paperDetailUnitExps = null;
-    		//通过map的key去取value，如果没有，就添加
-    		if(map.get(paperDetailExp.getSortNumber()) == null){
-    			paperDetailUnitExps = new ArrayList<PaperDetailUnitExp>();
-    		}else {
-				paperDetailUnitExps = map.get(paperDetailExp.getSortNumber());
-			}
-    		paperDetailUnitExps.addAll(paperDetailExp.getPaperDetailUnits());
-    		map.put(paperDetailExp.getSortNumber(), paperDetailUnitExps);
-    	}
-    	//循环所有小题，给小题排序
-    	for(Long sortNumber:map.keySet()){
-    		List<PaperDetailUnitExp> paperDetailUnitExps = map.get(sortNumber);
-    		int number = 1;
-    		if(paperDetailUnitExps != null && paperDetailUnitExps.size()>0){
-    			for(int i = 0;i<paperDetailUnitExps.size();i++){
-    				PaperDetailUnitExp paperDetailUnitExp = paperDetailUnitExps.get(i);
-    				if(paperDetailUnitExp.getQuestionType() == QuesStructType.NESTED_ANSWER_QUESTION){
-    					List<Question> subQuestions = paperDetailUnitExp.getQuestion().getSubQuestions();
-    					for(int j = 0;j<subQuestions.size();j++){
-    						subQuestions.get(j).setNumber(number+j);
-    					}
-    					number += subQuestions.size();
-    				}else {
-    					paperDetailUnitExp.setNumber(number);
-    					number++;
-					}
-        		}
-    		}
-    	}
-	}
-
-   
-	
  	/**
 	 * 校验大题下的小题分数是不是一样
 	 * @param paperDetailExp
@@ -345,63 +295,6 @@ public  class InitPaperExpService {
 		return null;
 	}
 
-	/**
-     * 当大题下小题分数不是全部一样时，在小题题干后面加上小题的分数
-     * @param details
-     * @throws Exception
-     */
-    public void appendScoreToQuestionBody(List<PaperDetailExp> details) throws Exception{
-    	for(PaperDetailExp paperDetailExp:details){
-    		if(checkPaperDetailUnitScore(paperDetailExp)==null){
-    			for(PaperDetailUnitExp paperDetailUnit:paperDetailExp.getPaperDetailUnits()){
-    				//判断小题是否为套题
-    				if(paperDetailUnit.getQuestionType() == QuesStructType.NESTED_ANSWER_QUESTION){
-    					List<Question> subQuestions = paperDetailUnit.getQuestion().getSubQuestions();
-    					for(Question subQuestion:subQuestions){
-    						String questionBodyWord = appendScoreToQuestionBody(subQuestion.getQuesBodyWord(),subQuestion.getScore());
-    						subQuestion.setQuesBodyWord(questionBodyWord);
-    					}
-    				}else {
-    					Question question = paperDetailUnit.getQuestion();
-        				String questionBodyWord = appendScoreToQuestionBody(question.getQuesBodyWord(),paperDetailUnit.getScore());
-        				question.setQuesBodyWord(questionBodyWord);
-					}
-    			}
-    		}
-    	}
-    }
-    
-    /**
-     * 在题干上设置分数
-     * @throws Exception 
-     */
-    public String appendScoreToQuestionBody(String quesBodyWordMl,double score) throws Exception{
-    	String tmpStr = DocxProcessUtil.BODY_HEADER + quesBodyWordMl + DocxProcessUtil.BODY_TAIL;
-        Body body = (Body)XmlUtils.unmarshalString(tmpStr,Context.jc,Body.class);
-        List<Object> pList = body.getContent();
-        int index = 0;
-        for(Object pObj:pList){
-            if(index < pList.size()-1){
-                break;
-            }
-            P p = (P) pObj;
-            List<Object> pContent = p.getContent();
-            R run = new R();
-            Text text = new Text();
-            text.setValue("("+score+"分)");
-            run.getContent().add(text);
-            pContent.add(run);
-            index++;
-        }
-        StringBuffer pWordMl = new StringBuffer();
-        for(Object pObj:pList){
-            if(pObj instanceof P){
-                pWordMl.append(DocxProcessUtil.formatPWordMl(XmlUtils.marshaltoString(pObj)));
-            }
-        }
-        return pWordMl.toString();
-    }
-    
     /**
      * 套题添加到对应的大题
      * @param paperDetailUnit
@@ -472,51 +365,6 @@ public  class InitPaperExpService {
 		}
     }
 	
-	/**
-	 * 给小题选项进行排序
-	 * @param paperDetails
-	 * @param startIndxt
-	 * @throws Exception
-	 */
-	public void setUnitExpNumber(List<PaperDetailExp> paperDetails) throws Exception {
-		for (PaperDetailExp paperDetail : paperDetails) {
-			List<PaperDetailUnitExp> paperDetailUnitExpList = paperDetail.getPaperDetailUnits();
-			for (PaperDetailUnitExp paperDetailUnit:paperDetailUnitExpList) {
-				List<QuesOption> optionList = paperDetailUnit.getQuestion().getQuesOptions();
-				if (optionList != null && optionList.size() > 0) {
-					int index = 0;
-					for (QuesOption quesOption : optionList) {
-						quesOption.setOptionBodyWord(setOptionNum(quesOption.getOptionBodyWord(),getOptionNum(index)));
-						index++;
-					}
-				}
-				List<Question> subQuesList = paperDetailUnit.getQuestion().getSubQuestions();
-				Question question = paperDetailUnit.getQuestion();
-				// 套题序号
-				if (subQuesList != null && subQuesList.size() > 0) {
-					question.setQuesBodyWord(replaceQuesBlank(question.getQuesBodyWord(),subQuesList.get(0).getNumber()));
-					for (Question subQues : subQuesList) {
-						subQues.setQuesBodyWord(setSubQuesNum(subQues.getQuesBodyWord(),subQues.getNumber()));
-						subQues.setQuesAnswerWord(setSubQuesNum(subQues.getQuesAnswerWord(),subQues.getNumber()));
-						subQues.setQuesBodyWord(replaceQuesBlank(subQues.getQuesBodyWord(),subQues.getNumber()));
-						List<QuesOption> subOptionList = subQues.getQuesOptions();
-						if (subOptionList != null && subOptionList.size() > 0) {
-							int sub_index = 0;
-							for (QuesOption quesOption : subOptionList) {
-								quesOption.setOptionBodyWord(setOptionNum(quesOption.getOptionBodyWord(),getOptionNum(sub_index)));
-								sub_index++;
-							}
-						}
-					}
-				} else {
-					question.setQuesBodyWord(setSubQuesNum(question.getQuesBodyWord(), paperDetailUnit.getNumber()));
-					question.setQuesAnswerWord(setSubQuesNum(question.getQuesAnswerWord(),paperDetailUnit.getNumber()));
-					question.setQuesBodyWord(replaceQuesBlank(question.getQuesBodyWord(),paperDetailUnit.getNumber()));
-				}
-			}
-		}
-	}
-	
 	/**
      * 设置选项号
      * @param optionWordMl

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

@@ -61,7 +61,6 @@ public class ExportPaperServiceImpl implements ExportPaperService{
 		Paper paper = paperRepo.findOne(paperId);
 		List<Paper> papers = new ArrayList<Paper>();
 		papers.add(paper);
-		
 		String zipFileName = "paperZip";
 		File directory = new File(TEMP_FILE_EXP + File.separator + zipFileName);
 		if(!directory.exists()){