题库jar冲突提交

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/SydxExportPaperService.java

@@ -1,6 +1,7 @@
 package cn.com.qmth.examcloud.core.questions.service.export;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -11,6 +12,7 @@ import org.docx4j.wml.Body;
 import org.docx4j.wml.P;
 import org.docx4j.wml.R;
 import org.docx4j.wml.Text;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -149,18 +151,25 @@ public class SydxExportPaperService extends ExportPaperAbstractService{
         paperExp.setSubTitle(CommonUtils.PAPER_SUB_TITLE);
         //获取大题
         List<PaperDetail> paperDetails = paperDetailRepo.findByPaperOrderByNumber(paper);
-        List<PaperDetailExp> paperDetailExps = BeanCopierUtil.copyPropertiesOfList(paperDetails,PaperDetailExp.class);
+        List<PaperDetailExp> paperDetailExps = new ArrayList<PaperDetailExp>();
+        for(PaperDetail paperDetail:paperDetails){
+        	PaperDetailExp paperDetailExp = new PaperDetailExp();
+        	BeanUtils.copyProperties(paperDetail, paperDetailExp);
+        	paperDetailExps.add(paperDetailExp);
+        }
         paperExp.setPaperDetails(paperDetailExps);
-
         //封装小题
         for(int i = 0; i < paperDetailExps.size(); i++){
             PaperDetailExp paperDetailExp = paperDetailExps.get(i);
             paperDetailExp.setTitle(getDetailTitle(paperDetailExp));
             List<PaperDetailUnit> paperDetailUnits = paperDetailUnitRepo.findByPaperDetailOrderByNumber(paperDetails.get(i));
-
             setAnswerWord(paperDetailUnits);
-
-            List<PaperDetailUnitExp> paperDetailUnitExps = BeanCopierUtil.copyPropertiesOfList(paperDetailUnits,PaperDetailUnitExp.class);
+            List<PaperDetailUnitExp> paperDetailUnitExps = new ArrayList<PaperDetailUnitExp>();
+            for(PaperDetailUnit paperDetailUnit:paperDetailUnits){
+            	PaperDetailUnitExp paperDetailUnitExp = new PaperDetailUnitExp();
+            	BeanUtils.copyProperties(paperDetailUnit, paperDetailUnitExp);
+            	paperDetailUnitExps.add(paperDetailUnitExp);
+            }
             //选择题，套题下选择题  选项顺序重新排列
             paperService.reorderChoicequestionOption(paperDetailUnitExps);
             paperDetailExps.get(i).setPaperDetailUnits(paperDetailUnitExps);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExtractConfigServiceImpl.java

@@ -18,6 +18,7 @@ import org.bson.types.ObjectId;
 import org.nlpcn.commons.lang.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Example;
@@ -814,7 +815,12 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
         dto.setQuesOptions(buildQuestionOptionDto(ques.getQuesOptions()));
         if (ques.getQuestionType() == QuesStructType.NESTED_ANSWER_QUESTION) {
             List<Question> subQuesList = ques.getSubQuestions();
-            List<SubQuestionDto> subQuesDtos = BeanCopierUtil.copyPropertiesOfList(subQuesList, SubQuestionDto.class);
+            List<SubQuestionDto> subQuesDtos = new ArrayList<SubQuestionDto>();
+            for(Question question:subQuesList){
+            	SubQuestionDto subQuestionDto = new SubQuestionDto();
+            	BeanUtils.copyProperties(question, subQuestionDto);
+            	subQuesDtos.add(subQuestionDto);
+            }
             for (int m = 0; m < subQuesList.size(); m++) {
                 List<QuesOptionDto> quesOptionDtos = BeanCopierUtil
                         .copyPropertiesOfList(subQuesList.get(m).getQuesOptions(), QuesOptionDto.class);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/PaperServiceImpl.java

@@ -28,6 +28,7 @@ import org.docx4j.wml.P;
 import org.docx4j.wml.R;
 import org.docx4j.wml.Text;
 import org.nlpcn.commons.lang.util.StringUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Example;
@@ -525,16 +526,27 @@ public class PaperServiceImpl implements PaperService{
     public PaperExp getPaperDto(String id) {
         Paper paper = paperRepo.findOne(id);
         // 创建paperDto
-        PaperExp paperExp = BeanCopierUtil.copyProperties(paper,PaperExp.class);
+        PaperExp paperExp = new PaperExp();
+        BeanUtils.copyProperties(paper, paperExp);
         paperExp.setCourse(paper.getCourse());
         // 获取大题
         List<PaperDetail> paperDetails = paperDetailRepo.findByPaperOrderByNumber(paper);
-        List<PaperDetailExp> paperDetailExps = BeanCopierUtil.copyPropertiesOfList(paperDetails, PaperDetailExp.class);
+        List<PaperDetailExp> paperDetailExps = new ArrayList<PaperDetailExp>();
+        for(PaperDetail paperDetail:paperDetails){
+        	PaperDetailExp paperDetailExp = new PaperDetailExp();
+        	BeanUtils.copyProperties(paperDetail, paperDetailExp);
+        	paperDetailExps.add(paperDetailExp);
+        }
         // 封装小题
         for (int i = 0; i < paperDetailExps.size(); i++) {
             List<PaperDetailUnit> paperDetailUnits = paperDetailUnitRepo.findByPaperDetailOrderByNumber(paperDetails.get(i));
             if (paperDetailUnits != null && paperDetailUnits.size() > 0) {
-                List<PaperDetailUnitExp> paperDetailUnitExps = BeanCopierUtil.copyPropertiesOfList(paperDetailUnits,PaperDetailUnitExp.class);
+            	List<PaperDetailUnitExp> paperDetailUnitExps = new ArrayList<PaperDetailUnitExp>();
+            	for(PaperDetailUnit paperDetailUnit:paperDetailUnits){
+            		PaperDetailUnitExp paperDetailUnitExp = new PaperDetailUnitExp();
+            		BeanUtils.copyProperties(paperDetailUnit, paperDetailUnitExp);
+            		paperDetailUnitExps.add(paperDetailUnitExp);
+            	}
                 // 选择题，套题下选择题 选项顺序重新排列
                 reorderChoicequestionOption(paperDetailUnitExps);
                 paperDetailExps.get(i).setPaperDetailUnits(paperDetailUnitExps);
@@ -1425,12 +1437,22 @@ public class PaperServiceImpl implements PaperService{
         paperExp.setCourse(paper.getCourse());
         // 获取大题
         List<PaperDetail> paperDetails = paperDetailRepo.findByPaperOrderByNumber(paper);
-        List<PaperDetailExp> paperDetailExps = BeanCopierUtil.copyPropertiesOfList(paperDetails, PaperDetailExp.class);
+        List<PaperDetailExp> paperDetailExps = new ArrayList<PaperDetailExp>();
+        for(PaperDetail paperDetail:paperDetails){
+        	PaperDetailExp paperDetailExp = new PaperDetailExp();
+        	BeanUtils.copyProperties(paperDetail, paperDetailExp);
+        	paperDetailExps.add(paperDetailExp);
+        }
         // 封装小题
         for (int i = 0; i < paperDetailExps.size(); i++) {
             List<PaperDetailUnit> paperDetailUnits = paperDetailUnitRepo.findByPaperDetailOrderByNumber(paperDetails.get(i));
             if (paperDetailUnits != null && paperDetailUnits.size() > 0) {
-                List<PaperDetailUnitExp> paperDetailUnitExps = BeanCopierUtil.copyPropertiesOfList(paperDetailUnits,PaperDetailUnitExp.class);
+            	List<PaperDetailUnitExp> paperDetailUnitExps = new ArrayList<PaperDetailUnitExp>();
+            	for(PaperDetailUnit paperDetailUnit:paperDetailUnits){
+            		PaperDetailUnitExp paperDetailUnitExp = new PaperDetailUnitExp();
+            		BeanUtils.copyProperties(paperDetailUnit, paperDetailUnitExp);
+            		paperDetailUnitExps.add(paperDetailUnitExp);
+            	}
                 paperDetailExps.get(i).setPaperDetailUnits(paperDetailUnitExps);
                 paperDetailExps.get(i).setUnitCount(paperDetailUnitExps.size());
             } else {