just format code styles.

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/AudioTimeConfigRepo.java

@@ -9,22 +9,23 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.AudioTimeConfig;
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnit;
 
 /**
- * @author  	chenken
- * @date    	2017年8月10日 下午3:19:46
- * @company 	QMTH
+ * @author chenken
+ * @date 2017年8月10日 下午3:19:46
+ * @company QMTH
  * @description AudioTimeConfigRepo.java
  */
-public interface AudioTimeConfigRepo  extends MongoRepository<AudioTimeConfig,String>,QueryByExampleExecutor<AudioTimeConfig> {
-
-	/**
-	 * 根据examId删除设置
-	 * @param examId
-	 */
-	public void deleteByExamIdAndCourseCode(String examId,String courseCode);
-	
-	List<AudioTimeConfig> findByExamIdAndCourseCodeOrderByGroupCode(String examId,String courseCode);
-	
-	List<AudioTimeConfig> findByPaperDetailUnit(PaperDetailUnit paperDetailUnit);
-	
+public interface AudioTimeConfigRepo extends MongoRepository<AudioTimeConfig, String>, QueryByExampleExecutor<AudioTimeConfig> {
+
+    /**
+     * 根据examId删除设置
+     *
+     * @param examId
+     */
+    public void deleteByExamIdAndCourseCode(String examId, String courseCode);
+
+    List<AudioTimeConfig> findByExamIdAndCourseCodeOrderByGroupCode(String examId, String courseCode);
+
+    List<AudioTimeConfig> findByPaperDetailUnit(PaperDetailUnit paperDetailUnit);
+
 }
 

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/CoursePropertyRepo.java

@@ -7,30 +7,31 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
 import cn.com.qmth.examcloud.core.questions.dao.entity.CourseProperty;
+
 /**
- * @describle 课程属性repo
  * @author weiwenhai
- * @date   2017.11.2
+ * @describle 课程属性repo
+ * @date 2017.11.2
  */
-public interface CoursePropertyRepo extends JpaRepository<CourseProperty, Long>,QueryByExampleExecutor<CourseProperty>,JpaSpecificationExecutor<CourseProperty>{
-	
-	//查询所有课程属性
-	List<CourseProperty> findByOrgId(Long orgId);
-	
-	//根据属性名查询
-	CourseProperty findByNameAndOrgId(String name, Long orgId);
-	
-	//根据课程id查询
-	List<CourseProperty> findByCourseId(Long courseId);
-	
-	List<CourseProperty> findByCourseCode(String code);
-	
-	//根据课程代码查询已开启的课程属性
-	List<CourseProperty> findByCourseCodeAndEnable(String code,Boolean enable);
-	
-	//根据课程id查询已经开启的课程属性
-	List<CourseProperty> findByCourseIdAndEnable(Long courseId,Boolean enable);
-	
-	//根据id集合查询
-	List<CourseProperty> findByIdIn(List<Long> ids);
+public interface CoursePropertyRepo extends JpaRepository<CourseProperty, Long>, QueryByExampleExecutor<CourseProperty>, JpaSpecificationExecutor<CourseProperty> {
+
+    //查询所有课程属性
+    List<CourseProperty> findByOrgId(Long orgId);
+
+    //根据属性名查询
+    CourseProperty findByNameAndOrgId(String name, Long orgId);
+
+    //根据课程id查询
+    List<CourseProperty> findByCourseId(Long courseId);
+
+    List<CourseProperty> findByCourseCode(String code);
+
+    //根据课程代码查询已开启的课程属性
+    List<CourseProperty> findByCourseCodeAndEnable(String code, Boolean enable);
+
+    //根据课程id查询已经开启的课程属性
+    List<CourseProperty> findByCourseIdAndEnable(Long courseId, Boolean enable);
+
+    //根据id集合查询
+    List<CourseProperty> findByIdIn(List<Long> ids);
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/ExamFileRepo.java

@@ -6,12 +6,12 @@ import org.springframework.data.repository.query.QueryByExampleExecutor;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExamFile;
 
 /**
- * @author  	chenken
- * @date    	2017年7月13日 下午4:54:10
- * @company 	QMTH
+ * @author chenken
+ * @date 2017年7月13日 下午4:54:10
+ * @company QMTH
  * @description ExamFileRepo.java
  */
-public interface ExamFileRepo extends MongoRepository<ExamFile,String>,QueryByExampleExecutor<ExamFile> {
+public interface ExamFileRepo extends MongoRepository<ExamFile, String>, QueryByExampleExecutor<ExamFile> {
 
 }
 

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/ExamPaperRepo.java

@@ -5,6 +5,6 @@ import org.springframework.data.repository.query.QueryByExampleExecutor;
 
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExamPaper;
 
-public interface ExamPaperRepo extends MongoRepository<ExamPaper, Long>,QueryByExampleExecutor<ExamPaper> {
+public interface ExamPaperRepo extends MongoRepository<ExamPaper, Long>, QueryByExampleExecutor<ExamPaper> {
 
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/ExportServiceManageRepo.java

@@ -5,8 +5,8 @@ import org.springframework.data.repository.query.QueryByExampleExecutor;
 
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExportServiceManage;
 
-public interface ExportServiceManageRepo extends MongoRepository<ExportServiceManage, Long>,QueryByExampleExecutor<ExportServiceManage> {
-	ExportServiceManage findByOrgName(String orgName);
-	
-	ExportServiceManage findByOrgId(String orgId);
+public interface ExportServiceManageRepo extends MongoRepository<ExportServiceManage, Long>, QueryByExampleExecutor<ExportServiceManage> {
+    ExportServiceManage findByOrgName(String orgName);
+
+    ExportServiceManage findByOrgId(String orgId);
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/ExportStructureRepo.java

@@ -6,12 +6,12 @@ import org.springframework.data.repository.query.QueryByExampleExecutor;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 
 /**
- * @author  	chenken
- * @date    	2017年7月12日 下午4:34:35
- * @company 	QMTH
+ * @author chenken
+ * @date 2017年7月12日 下午4:34:35
+ * @company QMTH
  * @description ExportStructureRepo.java
  */
-public interface ExportStructureRepo  extends MongoRepository<ExportStructure, String>,QueryByExampleExecutor<ExportStructure> {
+public interface ExportStructureRepo extends MongoRepository<ExportStructure, String>, QueryByExampleExecutor<ExportStructure> {
 
 }
 

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/ExtractConfigRepo.java

@@ -4,10 +4,11 @@ import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
+
 import java.util.List;
 
-public interface ExtractConfigRepo extends MongoRepository<ExtractConfig, String>,QueryByExampleExecutor<ExtractConfig> {
+public interface ExtractConfigRepo extends MongoRepository<ExtractConfig, String>, QueryByExampleExecutor<ExtractConfig> {
 
-    List<ExtractConfig> findByCourseCodeAndOrgId(String courseCode,String orgId);
+    List<ExtractConfig> findByCourseCodeAndOrgId(String courseCode, String orgId);
 
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/PaperDetailRepo.java

@@ -4,10 +4,11 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.Paper;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetail;
+
 import java.util.List;
 
-public interface PaperDetailRepo extends MongoRepository<PaperDetail, String>,QueryByExampleExecutor<PaperDetail> {
-	List<PaperDetail> findByPaperOrderByNumber(Paper paper);
+public interface PaperDetailRepo extends MongoRepository<PaperDetail, String>, QueryByExampleExecutor<PaperDetail> {
+    List<PaperDetail> findByPaperOrderByNumber(Paper paper);
 
-	List<PaperDetail> findByPaper(Paper paper);
+    List<PaperDetail> findByPaper(Paper paper);
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/PaperDetailUnitNativeRepo.java

@@ -29,7 +29,7 @@ import static com.mongodb.client.model.Filters.eq;
  * Created by songyue on 18/1/22.
  */
 @Repository
-public class PaperDetailUnitNativeRepo{
+public class PaperDetailUnitNativeRepo {
 
     private static final Logger log = LoggerFactory.getLogger(PaperDetailUnitNativeRepo.class);
 
@@ -40,15 +40,15 @@ public class PaperDetailUnitNativeRepo{
     @Autowired
     private MongoTemplate mongoTemplate;
 
-    public List<PaperDetailUnit> findByPaperId(String paperId){
+    public List<PaperDetailUnit> findByPaperId(String paperId) {
 
         long beginTime = System.currentTimeMillis();
 
         //初始化试卷缓存
-        Paper paperCache = mongoTemplate.findById(getObjectId(paperId),Paper.class);
+        Paper paperCache = mongoTemplate.findById(getObjectId(paperId), Paper.class);
 
         //初始化大题缓存
-        Map<String,PaperDetail> pdCache = new HashMap<>();
+        Map<String, PaperDetail> pdCache = new HashMap<>();
 
         //初始化小题列表
         List<PaperDetailUnit> paperDetailUnits = new ArrayList<>();
@@ -56,74 +56,74 @@ public class PaperDetailUnitNativeRepo{
         //获取小题原始文档
         MongoCursor<Document> mongoCursor = mongoCollection.find(eq("paper.$id", getObjectId(paperId))).iterator();
         long documentEndTime = System.currentTimeMillis();
-        log.info("获取document共耗时:"+(documentEndTime - beginTime)+"ms");
+        log.info("获取document共耗时:" + (documentEndTime - beginTime) + "ms");
 
         //转换小题文档
-        while(mongoCursor.hasNext()){
+        while (mongoCursor.hasNext()) {
             Document document = mongoCursor.next();
-            PaperDetailUnit pdu = toDomain(document,paperCache,pdCache);
+            PaperDetailUnit pdu = toDomain(document, paperCache, pdCache);
             paperDetailUnits.add(pdu);
         }
         long pduEndTime = System.currentTimeMillis();
-        log.info("转换document共耗时:"+(pduEndTime - documentEndTime)+"ms");
+        log.info("转换document共耗时:" + (pduEndTime - documentEndTime) + "ms");
         return paperDetailUnits;
     }
 
     @SuppressWarnings("unchecked")
-	private PaperDetailUnit toDomain(Document document,
+    private PaperDetailUnit toDomain(Document document,
                                      Paper paperCache,
-                                     Map<String,PaperDetail> pdCache){
+                                     Map<String, PaperDetail> pdCache) {
         PaperDetailUnit paperDetailUnit = new PaperDetailUnit();
         Set<String> pduProperty = document.keySet();
-        for(String key:pduProperty){
-            if(key.equals("_id")){
+        for (String key : pduProperty) {
+            if (key.equals("_id")) {
 
                 paperDetailUnit.setId(String.valueOf(document.get(key)));
 
-            }else if(key.equals("number")){
+            } else if (key.equals("number")) {
 
                 paperDetailUnit.setNumber(document.getInteger(key));
 
-            }else if(key.equals("score")){
+            } else if (key.equals("score")) {
 
                 paperDetailUnit.setScore(document.getDouble(key));
 
-            }else if(key.equals("subScoreList")){
+            } else if (key.equals("subScoreList")) {
 
-                List<Double> subScoreList = document.get(key,List.class);
+                List<Double> subScoreList = document.get(key, List.class);
                 paperDetailUnit.setSubScoreList(subScoreList);
 
-            }else if(key.equals("questionType")){
+            } else if (key.equals("questionType")) {
 
                 String quesType = document.getString(key);
                 paperDetailUnit.setQuestionType(QuesStructType.valueOf(quesType));
 
-            }else if(key.equals("optionOrder")){
+            } else if (key.equals("optionOrder")) {
 
                 paperDetailUnit.setOptionOrder(document.getString(key));
 
-            }else if(key.equals("creator")){
+            } else if (key.equals("creator")) {
 
                 paperDetailUnit.setCreator(document.getString(key));
 
-            }else if(key.equals("createTime")){
+            } else if (key.equals("createTime")) {
 
                 paperDetailUnit.setCreateTime(document.getString(key));
 
-            }else if(key.equals("paperType")){
+            } else if (key.equals("paperType")) {
 
                 String paperType = document.getString(key);
                 paperDetailUnit.setPaperType(PaperType.valueOf(paperType));
 
-            }else if(key.equals("paper")){
+            } else if (key.equals("paper")) {
 
                 paperDetailUnit.setPaper(paperCache);
 
-            }else if(key.equals("paperDetail")){
+            } else if (key.equals("paperDetail")) {
 
-                paperDetailUnit.setPaperDetail(getPaperDetail(document,pdCache));
+                paperDetailUnit.setPaperDetail(getPaperDetail(document, pdCache));
 
-            }else if(key.equals("question")){
+            } else if (key.equals("question")) {
 
                 paperDetailUnit.setQuestion(getQuestion(document));
 
@@ -132,36 +132,36 @@ public class PaperDetailUnitNativeRepo{
         return paperDetailUnit;
     }
 
-    private Object getObjectId(String id){
-        if(id == null){
+    private Object getObjectId(String id) {
+        if (id == null) {
             return null;
         }
         return ObjectId.isValid(id) ? new ObjectId(id) : id;
     }
 
-    private PaperDetail getPaperDetail(Document parentDocument,Map<String,PaperDetail> pdCache){
+    private PaperDetail getPaperDetail(Document parentDocument, Map<String, PaperDetail> pdCache) {
         Object value = parentDocument.get("paperDetail");
-        if(value == null || !(value instanceof DBRef)){
+        if (value == null || !(value instanceof DBRef)) {
             return null;
         }
         DBRef paperDetailDoc = (DBRef) value;
         String paperDetailId = String.valueOf(paperDetailDoc.getId());
         PaperDetail paperDetail = pdCache.get(paperDetailId);
-        if(paperDetail == null){
-            paperDetail = mongoTemplate.findById(getObjectId(paperDetailId),PaperDetail.class);
-            pdCache.put(paperDetailId,paperDetail);
+        if (paperDetail == null) {
+            paperDetail = mongoTemplate.findById(getObjectId(paperDetailId), PaperDetail.class);
+            pdCache.put(paperDetailId, paperDetail);
         }
         return paperDetail;
     }
 
-    private Question getQuestion(Document parentDocument){
+    private Question getQuestion(Document parentDocument) {
         Object value = parentDocument.get("question");
-        if(value == null || !(value instanceof DBRef)){
+        if (value == null || !(value instanceof DBRef)) {
             return null;
         }
         DBRef quesDoc = (DBRef) value;
         String quesId = String.valueOf(quesDoc.getId());
-        Question question = mongoTemplate.findById(getObjectId(quesId),Question.class);
+        Question question = mongoTemplate.findById(getObjectId(quesId), Question.class);
         return question;
     }
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/PaperDetailUnitRepo.java

@@ -15,37 +15,51 @@ import java.util.List;
 import java.util.Optional;
 
 
-public interface PaperDetailUnitRepo extends MongoRepository<PaperDetailUnit, String>,QueryByExampleExecutor<PaperDetailUnit> {
+public interface PaperDetailUnitRepo extends MongoRepository<PaperDetailUnit, String>, QueryByExampleExecutor<PaperDetailUnit> {
     List<PaperDetailUnit> findByPaperDetailOrderByNumber(PaperDetail paperDetail);
+
     List<PaperDetailUnit> findByPaperOrderByNumber(Paper paper);
+
     List<PaperDetailUnit> findByPaper(Paper paper);
+
     List<PaperDetailUnit> findByPaperId(String paperId);
+
     List<PaperDetailUnit> findByPaperIdOrderByNumber(String paperId);
+
     List<PaperDetailUnit> findByQuestion(Question question);
+
     List<PaperDetailUnit> findByQuestionIn(List<Question> questionList);
+
     Optional<PaperDetailUnit> findById(String id);
+
     List<PaperDetailUnit> findByQuestionType(QuesStructType quesType);
+
     Long countByPaperDetail(PaperDetail paperDetail);
+
     /**
      * 查询大题下的小题
      * 按number降序排列，取第一个，也就是number最大那个
+     *
      * @param paperDetail
      * @return
      */
     PaperDetailUnit findTopByPaperDetailOrderByNumberDesc(PaperDetail paperDetail);
+
     /**
      * 查询大题下的小题
      * 按number升序排列，取第一个，也就是number最小那个
+     *
      * @param paperDetail
      * @return
      */
     PaperDetailUnit findTopByPaperDetailOrderByNumberAsc(PaperDetail paperDetail);
-    
+
     /**
      * 查询试卷中的第几个试题
+     *
      * @param paper
      * @param number
      * @return
      */
-    PaperDetailUnit findByPaperAndNumber(Paper paper,Integer number);
+    PaperDetailUnit findByPaperAndNumber(Paper paper, Integer number);
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/PaperRepo.java

@@ -24,16 +24,16 @@ public interface PaperRepo extends MongoRepository<Paper, String>, QueryByExampl
     List<Paper> findByNameAndOrgId(String name, String orgId);
 
     Page<Paper> findByIdNotInAndCourseNoAndOrgIdAndPaperType(Set<String> idSet, String courseNo, String orgId,
-            PaperType paperType, Pageable page);
+                                                             PaperType paperType, Pageable page);
+
+    List<Paper> findByCourseNoAndOrgId(String courseNo, String orgId);
 
-    List<Paper> findByCourseNoAndOrgId(String courseNo,String orgId);
-    
     List<Paper> findByIdIn(List<String> paperIds);
-    
-    List<Paper> findBySpecialtyCodeAndOrgId(String specialtyCode,String orgId);
-    
+
+    List<Paper> findBySpecialtyCodeAndOrgId(String specialtyCode, String orgId);
+
     Paper findByNameAndOrgIdAndPaperType(String name, String orgId, PaperType paperType);
-    
+
     List<Paper> findByPaperType(PaperType paperType);
 
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/PaperStructRepo.java

@@ -5,6 +5,6 @@ import org.springframework.data.repository.query.QueryByExampleExecutor;
 
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperStruct;
 
-public interface PaperStructRepo extends MongoRepository<PaperStruct, String>,QueryByExampleExecutor<PaperStruct> {
-	
+public interface PaperStructRepo extends MongoRepository<PaperStruct, String>, QueryByExampleExecutor<PaperStruct> {
+
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/PropertyRepo.java

@@ -7,20 +7,21 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
 import cn.com.qmth.examcloud.core.questions.dao.entity.Property;
+
 /**
- * @describle 课程属性repo
  * @author weiwenhai
- * @date   2017.11.6
+ * @describle 课程属性repo
+ * @date 2017.11.6
  */
-public interface PropertyRepo extends JpaRepository<Property, Long>, QueryByExampleExecutor<Property> ,JpaSpecificationExecutor<Property>{
-	
-	//查询所有节点
-	List<Property> findByOrgIdAndCoursePropertyIdAndParentIdOrderByNumber(Long orgId, Long coursePropertyId, Long parentId);
-	
-	//查询子节点
-	List<Property> findByParentIdOrderByNumber(Long parentId);
-	
-	//根据课程属性id，一级id，属性名称查询
-	Property findByOrgIdAndCoursePropertyIdAndParentIdAndName(Long orgId, Long coursePropertyId, Long parentId, String name);
+public interface PropertyRepo extends JpaRepository<Property, Long>, QueryByExampleExecutor<Property>, JpaSpecificationExecutor<Property> {
+
+    //查询所有节点
+    List<Property> findByOrgIdAndCoursePropertyIdAndParentIdOrderByNumber(Long orgId, Long coursePropertyId, Long parentId);
+
+    //查询子节点
+    List<Property> findByParentIdOrderByNumber(Long parentId);
+
+    //根据课程属性id，一级id，属性名称查询
+    Property findByOrgIdAndCoursePropertyIdAndParentIdAndName(Long orgId, Long coursePropertyId, Long parentId, String name);
 
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/QuesRepo.java

@@ -17,16 +17,16 @@ import java.util.Set;
  */
 public interface QuesRepo extends MongoRepository<Question, String>, QueryByExampleExecutor<Question> {
 
-    Page<Question> findByIdNotInAndCourseNoAndOrgId(Set<String> idSet, String courseNo, String orgId,Pageable page);
+    Page<Question> findByIdNotInAndCourseNoAndOrgId(Set<String> idSet, String courseNo, String orgId, Pageable page);
 
     Page<Question> findByIdNotInAndCourseNoAndQuestionTypeAndOrgId(Set<String> idSet, String courseNo,
-                                                                   QuesStructType quesType, String orgId,Pageable page);
+                                                                   QuesStructType quesType, String orgId, Pageable page);
 
     List<Question> findByCourseNoAndOrgId(String courseNo, String orgId);
-    
-    List<Question> findBySpecialtyCodeAndOrgId(String specialtyCode,String orgId);
-    
-    List<Question> findByCourseAndOrgId(Course course,String orgId);
-    
+
+    List<Question> findBySpecialtyCodeAndOrgId(String specialtyCode, String orgId);
+
+    List<Question> findByCourseAndOrgId(Course course, String orgId);
+
     List<Question> findByIdIn(Set<String> ids);
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/QuesTypeNameRepo.java

@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * Created by songyue on 17/8/22.
  */
-public interface QuesTypeNameRepo extends MongoRepository<QuesTypeName,String>{
+public interface QuesTypeNameRepo extends MongoRepository<QuesTypeName, String> {
 
     @Query(value = "{\"orgId\":?0,\"courseNo\":?1,\"questionType\":?2}")
     List<QuesTypeName> findQuesName(String orgId, String courseNo, QuesStructType quesType);

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/QuestionAudioRepo.java

@@ -8,18 +8,18 @@ import org.springframework.data.repository.query.QueryByExampleExecutor;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionAudio;
 
 /**
- * @author  	chenken
- * @date    	2017年8月1日 上午11:31:23
- * @company 	QMTH
+ * @author chenken
+ * @date 2017年8月1日 上午11:31:23
+ * @company QMTH
  * @description QuestionRadioRepo.java
  */
 public interface QuestionAudioRepo extends MongoRepository<QuestionAudio, String>, QueryByExampleExecutor<QuestionAudio> {
-	
-	public List<QuestionAudio> findByQuestionId(String questionId);
 
-	public QuestionAudio findByQuestionIdAndFileName(String questionId,String fileName);
-	
-	public List<QuestionAudio> findByQuestionIdIn(List<String> ids);
-	
+    public List<QuestionAudio> findByQuestionId(String questionId);
+
+    public QuestionAudio findByQuestionIdAndFileName(String questionId, String fileName);
+
+    public List<QuestionAudio> findByQuestionIdIn(List<String> ids);
+
 }
 

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/SettingRepo.java

@@ -8,5 +8,5 @@ import org.springframework.data.repository.query.QueryByExampleExecutor;
 /**
  * Created by songyue on 16/12/26.
  */
-public interface SettingRepo extends MongoRepository<Setting, String>,QueryByExampleExecutor<Setting> {
+public interface SettingRepo extends MongoRepository<Setting, String>, QueryByExampleExecutor<Setting> {
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/AudioTimeConfig.java

@@ -6,34 +6,33 @@ import java.util.Date;
 import org.springframework.data.mongodb.core.mapping.DBRef;
 
 
-
 /**
- * @author  	chenken
- * @date    	017年8月10日 下午:5:53
- * @company 	QMTH
+ * @author chenken
+ * @date 017年8月10日 下午:5:53
+ * @company QMTH
  * @description 音频播放次数设置
  */
 public class AudioTimeConfig implements Serializable {
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -33466644941641357L;
-	private String id;
-	/**
-	 * 考试ID
-	 */
-	private String examId;
-	/**
-	 * 考试名称
-	 */
-	private String examName;
-	
-	/**
-	 * 课程ID
-	 */
-	private String courseCode;
-	/**
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = -33466644941641357L;
+    private String id;
+    /**
+     * 考试ID
+     */
+    private String examId;
+    /**
+     * 考试名称
+     */
+    private String examName;
+
+    /**
+     * 课程ID
+     */
+    private String courseCode;
+    /**
      * 关联试卷
      */
     @DBRef
@@ -47,108 +46,131 @@ public class AudioTimeConfig implements Serializable {
      */
     @DBRef
     private PaperDetailUnit paperDetailUnit;
-    
+
     private String questionId;
-    
+
     /**
      * 播放次数
      */
     private Integer playTime;
-    
+
     private Date createDate;
-    
+
     private String createUser;
-    
-    public AudioTimeConfig(){}
-    
-	public AudioTimeConfig(String examId, String courseCode, String groupCode,String questionId) {
-		super();
-		this.examId = examId;
-		this.courseCode = courseCode;
-		this.groupCode = groupCode;
-		this.questionId = questionId;
-	}
-	public AudioTimeConfig(String examId,String examName,String groupCode,String courseCode, PaperDetailUnit paperDetailUnit) {
-		this.examId = examId;
-		this.examName = examName;
-		this.courseCode = courseCode;
-		this.groupCode = groupCode;
-		this.paperDetailUnit = paperDetailUnit;
-		if(this.paperDetailUnit!=null){
-			this.questionId = this.paperDetailUnit.getQuestion().getId();
-			this.paper = this.paperDetailUnit.getPaper();
-		}
-	}
-
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-	public String getExamId() {
-		return examId;
-	}
-	public void setExamId(String examId) {
-		this.examId = examId;
-	}
-	public String getExamName() {
-		return examName;
-	}
-	public void setExamName(String examName) {
-		this.examName = examName;
-	}
-	public Paper getPaper() {
-		return paper;
-	}
-	public void setPaper(Paper paper) {
-		this.paper = paper;
-	}
-	public PaperDetailUnit getPaperDetailUnit() {
-		return paperDetailUnit;
-	}
-	public void setPaperDetailUnit(PaperDetailUnit paperDetailUnit) {
-		this.paperDetailUnit = paperDetailUnit;
-		if(paperDetailUnit!=null&&paperDetailUnit.getQuestion()!=null){
-			this.setQuestionId(paperDetailUnit.getQuestion().getId());
-		}
-	}
-	public Integer getPlayTime() {
-		return playTime;
-	}
-	public void setPlayTime(Integer playTime) {
-		this.playTime = playTime;
-	}
-	public Date getCreateDate() {
-		return createDate;
-	}
-	public void setCreateDate(Date createDate) {
-		this.createDate = createDate;
-	}
-	public String getCreateUser() {
-		return createUser;
-	}
-	public void setCreateUser(String createUser) {
-		this.createUser = createUser;
-	}
-	public String getGroupCode() {
-		return groupCode;
-	}
-	public void setGroupCode(String groupCode) {
-		this.groupCode = groupCode;
-	}
-	public String getCourseCode() {
-		return courseCode;
-	}
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
-	public String getQuestionId() {
-		return questionId;
-	}
-	public void setQuestionId(String questionId) {
-		this.questionId = questionId;
-	}
-	
+
+    public AudioTimeConfig() {
+    }
+
+    public AudioTimeConfig(String examId, String courseCode, String groupCode, String questionId) {
+        super();
+        this.examId = examId;
+        this.courseCode = courseCode;
+        this.groupCode = groupCode;
+        this.questionId = questionId;
+    }
+
+    public AudioTimeConfig(String examId, String examName, String groupCode, String courseCode, PaperDetailUnit paperDetailUnit) {
+        this.examId = examId;
+        this.examName = examName;
+        this.courseCode = courseCode;
+        this.groupCode = groupCode;
+        this.paperDetailUnit = paperDetailUnit;
+        if (this.paperDetailUnit != null) {
+            this.questionId = this.paperDetailUnit.getQuestion().getId();
+            this.paper = this.paperDetailUnit.getPaper();
+        }
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getExamId() {
+        return examId;
+    }
+
+    public void setExamId(String examId) {
+        this.examId = examId;
+    }
+
+    public String getExamName() {
+        return examName;
+    }
+
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
+
+    public Paper getPaper() {
+        return paper;
+    }
+
+    public void setPaper(Paper paper) {
+        this.paper = paper;
+    }
+
+    public PaperDetailUnit getPaperDetailUnit() {
+        return paperDetailUnit;
+    }
+
+    public void setPaperDetailUnit(PaperDetailUnit paperDetailUnit) {
+        this.paperDetailUnit = paperDetailUnit;
+        if (paperDetailUnit != null && paperDetailUnit.getQuestion() != null) {
+            this.setQuestionId(paperDetailUnit.getQuestion().getId());
+        }
+    }
+
+    public Integer getPlayTime() {
+        return playTime;
+    }
+
+    public void setPlayTime(Integer playTime) {
+        this.playTime = playTime;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    public String getGroupCode() {
+        return groupCode;
+    }
+
+    public void setGroupCode(String groupCode) {
+        this.groupCode = groupCode;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getQuestionId() {
+        return questionId;
+    }
+
+    public void setQuestionId(String questionId) {
+        this.questionId = questionId;
+    }
+
 }
 

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/Course.java

@@ -7,7 +7,7 @@ import java.io.Serializable;
 /**
  * Created by songyue on 16/12/26.
  */
-public class Course implements Serializable{
+public class Course implements Serializable {
     private static final long serialVersionUID = 7794074467488869343L;
 
     @Id
@@ -94,7 +94,7 @@ public class Course implements Serializable{
     public Course() {
     }
 
-    public Course(String enable){
+    public Course(String enable) {
         this.enable = enable;
     }
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/CoursePropertyNumber.java

@@ -1,135 +1,135 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
 
 public class CoursePropertyNumber {
-	
-	private Long id; 
-	
-	private Long propertyId;
-	
-	private Long propertyParentId;
-	
-	private String propertyName;
-	
-	private Integer number;
-	
-	private Double score; //每题分数
-	
-	private Integer publicSimple; //公开简单
-	
-	private Integer publicMedium; //公开中等
-	
-	private Integer publicDifficulty; //公开困难
-	
-	private Integer noPublicSimple; //非公开简单
-	
-	private Integer noPublicMedium; //非公开中等
-	
-	private Integer noPublicDifficulty; //非公开困难
-	
-	private Boolean disable; //是否显示
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getPropertyId() {
-		return propertyId;
-	}
-
-	public void setPropertyId(Long propertyId) {
-		this.propertyId = propertyId;
-	}
-
-	public Long getPropertyParentId() {
-		return propertyParentId;
-	}
-
-	public void setPropertyParentId(Long propertyParentId) {
-		this.propertyParentId = propertyParentId;
-	}
-
-	public String getPropertyName() {
-		return propertyName;
-	}
-
-	public void setPropertyName(String propertyName) {
-		this.propertyName = propertyName;
-	}
-
-	public Integer getNumber() {
-		return number;
-	}
-
-	public void setNumber(Integer number) {
-		this.number = number;
-	}
-
-	public Integer getPublicSimple() {
-		return publicSimple;
-	}
-
-	public void setPublicSimple(Integer publicSimple) {
-		this.publicSimple = publicSimple;
-	}
-
-	public Integer getPublicMedium() {
-		return publicMedium;
-	}
-
-	public void setPublicMedium(Integer publicMedium) {
-		this.publicMedium = publicMedium;
-	}
-
-	public Integer getPublicDifficulty() {
-		return publicDifficulty;
-	}
-
-	public void setPublicDifficulty(Integer publicDifficulty) {
-		this.publicDifficulty = publicDifficulty;
-	}
-
-	public Integer getNoPublicSimple() {
-		return noPublicSimple;
-	}
-
-	public void setNoPublicSimple(Integer noPublicSimple) {
-		this.noPublicSimple = noPublicSimple;
-	}
-
-	public Integer getNoPublicMedium() {
-		return noPublicMedium;
-	}
-
-	public void setNoPublicMedium(Integer noPublicMedium) {
-		this.noPublicMedium = noPublicMedium;
-	}
-
-	public Integer getNoPublicDifficulty() {
-		return noPublicDifficulty;
-	}
-
-	public void setNoPublicDifficulty(Integer noPublicDifficulty) {
-		this.noPublicDifficulty = noPublicDifficulty;
-	}
-
-	public Boolean getDisable() {
-		return disable;
-	}
-
-	public void setDisable(Boolean disable) {
-		this.disable = disable;
-	}
-
-	public Double getScore() {
-		return score;
-	}
 
-	public void setScore(Double score) {
-		this.score = score;
-	}
-	
+    private Long id;
+
+    private Long propertyId;
+
+    private Long propertyParentId;
+
+    private String propertyName;
+
+    private Integer number;
+
+    private Double score; //每题分数
+
+    private Integer publicSimple; //公开简单
+
+    private Integer publicMedium; //公开中等
+
+    private Integer publicDifficulty; //公开困难
+
+    private Integer noPublicSimple; //非公开简单
+
+    private Integer noPublicMedium; //非公开中等
+
+    private Integer noPublicDifficulty; //非公开困难
+
+    private Boolean disable; //是否显示
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getPropertyId() {
+        return propertyId;
+    }
+
+    public void setPropertyId(Long propertyId) {
+        this.propertyId = propertyId;
+    }
+
+    public Long getPropertyParentId() {
+        return propertyParentId;
+    }
+
+    public void setPropertyParentId(Long propertyParentId) {
+        this.propertyParentId = propertyParentId;
+    }
+
+    public String getPropertyName() {
+        return propertyName;
+    }
+
+    public void setPropertyName(String propertyName) {
+        this.propertyName = propertyName;
+    }
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    public Integer getPublicSimple() {
+        return publicSimple;
+    }
+
+    public void setPublicSimple(Integer publicSimple) {
+        this.publicSimple = publicSimple;
+    }
+
+    public Integer getPublicMedium() {
+        return publicMedium;
+    }
+
+    public void setPublicMedium(Integer publicMedium) {
+        this.publicMedium = publicMedium;
+    }
+
+    public Integer getPublicDifficulty() {
+        return publicDifficulty;
+    }
+
+    public void setPublicDifficulty(Integer publicDifficulty) {
+        this.publicDifficulty = publicDifficulty;
+    }
+
+    public Integer getNoPublicSimple() {
+        return noPublicSimple;
+    }
+
+    public void setNoPublicSimple(Integer noPublicSimple) {
+        this.noPublicSimple = noPublicSimple;
+    }
+
+    public Integer getNoPublicMedium() {
+        return noPublicMedium;
+    }
+
+    public void setNoPublicMedium(Integer noPublicMedium) {
+        this.noPublicMedium = noPublicMedium;
+    }
+
+    public Integer getNoPublicDifficulty() {
+        return noPublicDifficulty;
+    }
+
+    public void setNoPublicDifficulty(Integer noPublicDifficulty) {
+        this.noPublicDifficulty = noPublicDifficulty;
+    }
+
+    public Boolean getDisable() {
+        return disable;
+    }
+
+    public void setDisable(Boolean disable) {
+        this.disable = disable;
+    }
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/ExamFile.java

@@ -15,262 +15,266 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.computerTestModel.Compute
 import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
 
 /**
- * @author  	chenken
- * @date    	2017年7月13日 下午4:22:24
- * @company 	QMTH
+ * @author chenken
+ * @date 2017年7月13日 下午4:22:24
+ * @company QMTH
  * @description 考试文件
  */
-public class ExamFile implements Serializable{
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 7565454762976257111L;
-
-	@Id
-	private String id;
-	
-	/**
-	 * 机构ID
-	 */
-	private String orgId;
-	/**
-	 * 机构名称
-	 */
-	private String orgName;
-	/**
-	 * 考试ID
-	 */
-	private String examId;
-	/**
-	 * 考试名称
-	 */
-	private String examName;
-	/**
-	 * 考试类型
-	 */
-	private ExamType examType;
-	/**
-	 * 试卷类型
-	 */
-	private String groupCode;
-	/**
-	 * 课程ID
-	 */
-	private String courseId;
-	/**
-	 * 课程名称
-	 */
-	private String courseName;
-	/**
-	 * 文件名称
-	 */
-	private String fileName;
-	/**
-	 * 文件类型
-	 * 		试卷
-	 * 		答案
-	 * 		试卷结构
-	 * 		音频文件
-	 * 		加密数据包
-	 */
-	private ExamFileType examFileType;
-	/**
-	 * 文件存储路径
-	 */
-	private String filePath;
-	/**
-	 * 创建人
-	 */
-	private String createUser;
-	/**
-	 * 创建时间
-	 */
+public class ExamFile implements Serializable {
+    /**
+     *
+     */
+    private static final long serialVersionUID = 7565454762976257111L;
+
+    @Id
+    private String id;
+
+    /**
+     * 机构ID
+     */
+    private String orgId;
+    /**
+     * 机构名称
+     */
+    private String orgName;
+    /**
+     * 考试ID
+     */
+    private String examId;
+    /**
+     * 考试名称
+     */
+    private String examName;
+    /**
+     * 考试类型
+     */
+    private ExamType examType;
+    /**
+     * 试卷类型
+     */
+    private String groupCode;
+    /**
+     * 课程ID
+     */
+    private String courseId;
+    /**
+     * 课程名称
+     */
+    private String courseName;
+    /**
+     * 文件名称
+     */
+    private String fileName;
+    /**
+     * 文件类型
+     * 试卷
+     * 答案
+     * 试卷结构
+     * 音频文件
+     * 加密数据包
+     */
+    private ExamFileType examFileType;
+    /**
+     * 文件存储路径
+     */
+    private String filePath;
+    /**
+     * 创建人
+     */
+    private String createUser;
+    /**
+     * 创建时间
+     */
     private Date createTime;
-    
-    public ExamFile(){
-    	
+
+    public ExamFile() {
+
     }
+
     /**
      * 普通
+     *
      * @param paperId
      * @param extractConfig
      * @param filePath
      * @param examFileType
      * @param fileSuffix
      */
-    public ExamFile(String paperId,ExtractConfig extractConfig,String filePath,ExamFileType examFileType,String fileSuffix){
-    	this.orgId = extractConfig.getOrgId();
-    	this.orgName = extractConfig.getOrgName();
-    	this.examId = extractConfig.getExamId()+"";
-    	this.examName = extractConfig.getExamName();
-    	this.examType = ExamType.strToEnum(extractConfig.getExamType());
-    	this.courseId = extractConfig.getCourseCode();
-    	this.courseName = extractConfig.getCourseName();
-    	//this.groupCode = findGroupCode(extractConfig,paperId);
-    	//this.fileName = extractConfig.getCourseName()+"_"+extractConfig.getCourseCode()+"_"+examFileType.getName()+"_"+this.groupCode+fileSuffix;
-    	this.filePath = filePath;
-    	this.examFileType = examFileType;
-    }
-    
+    public ExamFile(String paperId, ExtractConfig extractConfig, String filePath, ExamFileType examFileType, String fileSuffix) {
+        this.orgId = extractConfig.getOrgId();
+        this.orgName = extractConfig.getOrgName();
+        this.examId = extractConfig.getExamId() + "";
+        this.examName = extractConfig.getExamName();
+        this.examType = ExamType.strToEnum(extractConfig.getExamType());
+        this.courseId = extractConfig.getCourseCode();
+        this.courseName = extractConfig.getCourseName();
+        //this.groupCode = findGroupCode(extractConfig,paperId);
+        //this.fileName = extractConfig.getCourseName()+"_"+extractConfig.getCourseCode()+"_"+examFileType.getName()+"_"+this.groupCode+fileSuffix;
+        this.filePath = filePath;
+        this.examFileType = examFileType;
+    }
+
     /**
      * 机考
+     *
      * @param extractConfig
      * @param filePath
      * @param examFileType
      * @param computerTestPaper
      * @param fileSuffix
      */
-    public ExamFile(ComputerTestPaper computerTestPaper,ExtractConfig extractConfig,String filePath,ExamFileType examFileType,String fileSuffix){
-    	this.orgId = extractConfig.getOrgId();
-    	this.orgName = extractConfig.getOrgName();
-    	this.examId = extractConfig.getExamId()+"";
-    	this.examName = extractConfig.getExamName();
-    	this.examType = ExamType.strToEnum(extractConfig.getExamType());
-    	this.courseId = extractConfig.getCourseCode();
-    	this.courseName = extractConfig.getCourseName();
-    	//this.groupCode = findGroupCode(extractConfig,computerTestPaper.getId());
-    	this.fileName = extractConfig.getCourseCode()+"_"+computerTestPaper.getName()+fileSuffix;
-    	this.filePath = filePath;
-    	this.examFileType = examFileType;
-    }
-    
+    public ExamFile(ComputerTestPaper computerTestPaper, ExtractConfig extractConfig, String filePath, ExamFileType examFileType, String fileSuffix) {
+        this.orgId = extractConfig.getOrgId();
+        this.orgName = extractConfig.getOrgName();
+        this.examId = extractConfig.getExamId() + "";
+        this.examName = extractConfig.getExamName();
+        this.examType = ExamType.strToEnum(extractConfig.getExamType());
+        this.courseId = extractConfig.getCourseCode();
+        this.courseName = extractConfig.getCourseName();
+        //this.groupCode = findGroupCode(extractConfig,computerTestPaper.getId());
+        this.fileName = extractConfig.getCourseCode() + "_" + computerTestPaper.getName() + fileSuffix;
+        this.filePath = filePath;
+        this.examFileType = examFileType;
+    }
+
     /**
      * 筛选出groupCode
+     *
      * @param extractConfig
      * @param paperId
      * @return
      */
-    private String findGroupCode(ExtractConfig extractConfig,String paperId){
-    	String groupCode = "";
-    	Map<String,String> paperIdMap = extractConfig.getFinishedPaperIdMap();
-    	Set<Entry<String,String>> entry = paperIdMap.entrySet();
-		Iterator<Entry<String,String>> iterator = entry.iterator();
-		while(iterator.hasNext()){
-			Entry<String,String> next = iterator.next();
-			if(paperId.equals(next.getValue())){
-				groupCode = next.getKey();
-				break;
-			}
-		}
-		return groupCode;
-    }
-    
-    public ExamFile(String examId,String orgId){
-    	this.examId = examId;
-    	this.orgId = orgId;
-    }
-    
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getOrgName() {
-		return orgName;
-	}
-
-	public void setOrgName(String orgName) {
-		this.orgName = orgName;
-	}
-
-	public String getExamId() {
-		return examId;
-	}
-
-	public void setExamId(String examId) {
-		this.examId = examId;
-	}
-
-	public String getExamName() {
-		return examName;
-	}
-
-	public void setExamName(String examName) {
-		this.examName = examName;
-	}
-
-	public ExamType getExamType() {
-		return examType;
-	}
-
-	public void setExamType(ExamType examType) {
-		this.examType = examType;
-	}
-
-	public String getCourseId() {
-		return courseId;
-	}
-
-	public void setCourseId(String courseId) {
-		this.courseId = courseId;
-	}
-
-	public String getCourseName() {
-		return courseName;
-	}
-
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
-
-	public ExamFileType getExamFileType() {
-		return examFileType;
-	}
-
-	public void setExamFileType(ExamFileType examFileType) {
-		this.examFileType = examFileType;
-	}
-
-	public String getFilePath() {
-		return filePath;
-	}
-
-	public void setFilePath(String filePath) {
-		this.filePath = filePath;
-	}
-
-	public String getCreateUser() {
-		return createUser;
-	}
-
-	public void setCreateUser(String createUser) {
-		this.createUser = createUser;
-	}
-
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getFileName() {
-		return fileName;
-	}
-
-	public void setFileName(String fileName) {
-		this.fileName = fileName;
-	}
-
-	public String getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(String orgId) {
-		this.orgId = orgId;
-	}
+    private String findGroupCode(ExtractConfig extractConfig, String paperId) {
+        String groupCode = "";
+        Map<String, String> paperIdMap = extractConfig.getFinishedPaperIdMap();
+        Set<Entry<String, String>> entry = paperIdMap.entrySet();
+        Iterator<Entry<String, String>> iterator = entry.iterator();
+        while (iterator.hasNext()) {
+            Entry<String, String> next = iterator.next();
+            if (paperId.equals(next.getValue())) {
+                groupCode = next.getKey();
+                break;
+            }
+        }
+        return groupCode;
+    }
+
+    public ExamFile(String examId, String orgId) {
+        this.examId = examId;
+        this.orgId = orgId;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
 
-	public String getGroupCode() {
-		return groupCode;
-	}
+    public String getExamId() {
+        return examId;
+    }
+
+    public void setExamId(String examId) {
+        this.examId = examId;
+    }
+
+    public String getExamName() {
+        return examName;
+    }
+
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
+
+    public ExamType getExamType() {
+        return examType;
+    }
+
+    public void setExamType(ExamType examType) {
+        this.examType = examType;
+    }
+
+    public String getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(String courseId) {
+        this.courseId = courseId;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public ExamFileType getExamFileType() {
+        return examFileType;
+    }
+
+    public void setExamFileType(ExamFileType examFileType) {
+        this.examFileType = examFileType;
+    }
+
+    public String getFilePath() {
+        return filePath;
+    }
+
+    public void setFilePath(String filePath) {
+        this.filePath = filePath;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
+    public String getGroupCode() {
+        return groupCode;
+    }
+
+    public void setGroupCode(String groupCode) {
+        this.groupCode = groupCode;
+    }
 
-	public void setGroupCode(String groupCode) {
-		this.groupCode = groupCode;
-	}
-    
 }
 

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/ExamPaper.java

@@ -6,10 +6,9 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.DBRef;
 
 /**
- * 
- * @author  	chenken
- * @date    	2017年7月14日 上午9:34:16
- * @company 	QMTH
+ * @author chenken
+ * @date 2017年7月14日 上午9:34:16
+ * @company QMTH
  * @description 调卷规则关联试卷
  */
 public class ExamPaper implements Serializable {
@@ -93,12 +92,12 @@ public class ExamPaper implements Serializable {
         this.weight = weight;
     }
 
-	public Paper getPaper() {
-		return paper;
-	}
+    public Paper getPaper() {
+        return paper;
+    }
 
-	public void setPaper(Paper paper) {
-		this.paper = paper;
-	}
+    public void setPaper(Paper paper) {
+        this.paper = paper;
+    }
 
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/ExportServiceManage.java

@@ -4,49 +4,49 @@ import java.io.Serializable;
 
 import org.springframework.data.annotation.Id;
 
-public class ExportServiceManage  implements Serializable {
-
-	private static final long serialVersionUID = 561933232237607796L;
-
-	@Id
-	private String id;
-	
-	private String orgId;
-	 
-	private String orgName;
-	 
-	private String exportServiceName;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getOrgName() {
-		return orgName;
-	}
-
-	public void setOrgName(String orgName) {
-		this.orgName = orgName;
-	}
-
-	public String getExportServiceName() {
-		return exportServiceName;
-	}
-
-	public void setExportServiceName(String exportServiceName) {
-		this.exportServiceName = exportServiceName;
-	}
-
-	public String getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(String orgId) {
-		this.orgId = orgId;
-	}
-	  
+public class ExportServiceManage implements Serializable {
+
+    private static final long serialVersionUID = 561933232237607796L;
+
+    @Id
+    private String id;
+
+    private String orgId;
+
+    private String orgName;
+
+    private String exportServiceName;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
+    public String getExportServiceName() {
+        return exportServiceName;
+    }
+
+    public void setExportServiceName(String exportServiceName) {
+        this.exportServiceName = exportServiceName;
+    }
+
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/ExportStructure.java

@@ -11,168 +11,169 @@ import cn.com.qmth.examcloud.core.questions.base.enums.ExportType;
 import cn.com.qmth.examcloud.core.questions.base.em.enums.ExamType;
 
 /**
- * @author  	chenken
- * @date    	2017年7月12日 下午3:45:08
- * @company 	QMTH
+ * @author chenken
+ * @date 2017年7月12日 下午3:45:08
+ * @company QMTH
  * @description 导出结构设置
  */
-public class ExportStructure implements Serializable{
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -2710169914864126547L;
-	
-	@Id	
-	private String id;
-	/**
-	 * 考试类型
-	 */
-	private ExamType examType;
-	/**
-	 * 考试ID
-	 */
-	private String examId;
-	/**
-	 * 考试名称
-	 */
-	private String examName;
-	/**
-	 * 导出 类型
-	 */
-	private ExportType exportType;
-	
-	private List<QuestionTypeNum> questionTypeNums;
-	/**
-	 * 是否可用
-	 */
-	private Short useable;
-	
-	private String createUser;
+public class ExportStructure implements Serializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = -2710169914864126547L;
+
+    @Id
+    private String id;
+    /**
+     * 考试类型
+     */
+    private ExamType examType;
+    /**
+     * 考试ID
+     */
+    private String examId;
+    /**
+     * 考试名称
+     */
+    private String examName;
+    /**
+     * 导出 类型
+     */
+    private ExportType exportType;
+
+    private List<QuestionTypeNum> questionTypeNums;
+    /**
+     * 是否可用
+     */
+    private Short useable;
+
+    private String createUser;
 
     private Date createTime;
-    
+
     private String updateUser;
 
     private Date updateTime;
-    
+
     private String orgId;
-    
+
     private String orgName;
 
-    public ExportStructure(){}
-    
-    public ExportStructure(ExamType examType){
-    	this.examType = examType;
-    }
-    
-    public ExportStructure(String examId){
-    	this.examId = examId;
-    }
-    
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public ExamType getExamType() {
-		return examType;
-	}
-
-	public void setExamType(ExamType examType) {
-		this.examType = examType;
-	}
-
-	public String getExamName() {
-		return examName;
-	}
-
-	public void setExamName(String examName) {
-		this.examName = examName;
-	}
-
-	public ExportType getExportType() {
-		return exportType;
-	}
-
-	public void setExportType(ExportType exportType) {
-		this.exportType = exportType;
-	}
-
-	public Short getUseable() {
-		return useable;
-	}
-
-	public void setUseable(Short useable) {
-		this.useable = useable;
-	}
-
-	public String getCreateUser() {
-		return createUser;
-	}
-
-	public void setCreateUser(String createUser) {
-		this.createUser = createUser;
-	}
-
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getUpdateUser() {
-		return updateUser;
-	}
-
-	public void setUpdateUser(String updateUser) {
-		this.updateUser = updateUser;
-	}
-
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public String getExamId() {
-		return examId;
-	}
-
-	public void setExamId(String examId) {
-		this.examId = examId;
-	}
-	
-	public List<QuestionTypeNum> getQuestionTypeNums() {
-		return questionTypeNums;
-	}
-
-	public void setQuestionTypeNums(List<QuestionTypeNum> questionTypeNums) {
-		this.questionTypeNums = questionTypeNums;
-	}
-
-	public String getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(String orgId) {
-		this.orgId = orgId;
-	}
-
-	public String getOrgName() {
-		return orgName;
-	}
-
-	public void setOrgName(String orgName) {
-		this.orgName = orgName;
-	}
-	
+    public ExportStructure() {
+    }
+
+    public ExportStructure(ExamType examType) {
+        this.examType = examType;
+    }
+
+    public ExportStructure(String examId) {
+        this.examId = examId;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public ExamType getExamType() {
+        return examType;
+    }
+
+    public void setExamType(ExamType examType) {
+        this.examType = examType;
+    }
+
+    public String getExamName() {
+        return examName;
+    }
+
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
+
+    public ExportType getExportType() {
+        return exportType;
+    }
+
+    public void setExportType(ExportType exportType) {
+        this.exportType = exportType;
+    }
+
+    public Short getUseable() {
+        return useable;
+    }
+
+    public void setUseable(Short useable) {
+        this.useable = useable;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getExamId() {
+        return examId;
+    }
+
+    public void setExamId(String examId) {
+        this.examId = examId;
+    }
+
+    public List<QuestionTypeNum> getQuestionTypeNums() {
+        return questionTypeNums;
+    }
+
+    public void setQuestionTypeNums(List<QuestionTypeNum> questionTypeNums) {
+        this.questionTypeNums = questionTypeNums;
+    }
+
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
 }
 

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/ExtractConfig.java

@@ -13,8 +13,8 @@ import cn.com.qmth.examcloud.core.questions.base.enums.ExtractPolicy;
 
 /**
  * 调卷规则
- * @author chenken
  *
+ * @author chenken
  */
 public class ExtractConfig implements Serializable {
 
@@ -30,8 +30,8 @@ public class ExtractConfig implements Serializable {
     private Long examId;
     /**
      * 考试类型
-     * 		网络考试
-     * 		传统考试
+     * 网络考试
+     * 传统考试
      */
     private String examType;
     /**
@@ -47,11 +47,11 @@ public class ExtractConfig implements Serializable {
      */
     private String courseCode;
 
-	private Course course;
+    private Course course;
     /**
      * 调卷类型
-     * 		成套调用
-     * 		重组调用
+     * 成套调用
+     * 重组调用
      */
     private String callType;
     /**
@@ -63,13 +63,13 @@ public class ExtractConfig implements Serializable {
      * 已经生成的试卷ID Map
      * 数据结构:
      * {
-     * 		"A":"0001",
-     * 		"B":"0002"
+     * "A":"0001",
+     * "B":"0002"
      * }
      * A 类型下生成的paperId为 0001
      * B 类型下生成的paperId为 0002
      */
-    private Map<String,String> finishedPaperIdMap;
+    private Map<String, String> finishedPaperIdMap;
     /**
      * 抽取试卷对象集合
      */
@@ -86,7 +86,7 @@ public class ExtractConfig implements Serializable {
      * 0：不乱序
      */
     private Short scrambling_the_option_order;
-    
+
     /**
      * 抽卷规则
      */
@@ -94,34 +94,35 @@ public class ExtractConfig implements Serializable {
     /**
      * 类型参数
      */
-    private Map<String,Object> params;
+    private Map<String, Object> params;
     /**
      * 机构ID
      */
     private String orgId;
-    
+
     private String orgName;
-    
-    public ExtractConfig(){}
-    
-    public ExtractConfig(String id){
-    	this.id = id;
+
+    public ExtractConfig() {
+    }
+
+    public ExtractConfig(String id) {
+        this.id = id;
     }
-    
+
     public ExtractConfig(Long exam_id, String course_code) {
-    	this.examId = exam_id;
-    	this.courseCode = course_code;
-	}
-    
-	public ExtractConfig(ExamCourseDto examCourseDto) {
-		this.examId = examCourseDto.getExamId();
-		this.examName = examCourseDto.getExamName();
-		this.courseCode = examCourseDto.getCourseCode();
-		this.courseName = examCourseDto.getCourseName();
-		this.examType = examCourseDto.getExamType().name();
-	}
-
-	public Long getExamId() {
+        this.examId = exam_id;
+        this.courseCode = course_code;
+    }
+
+    public ExtractConfig(ExamCourseDto examCourseDto) {
+        this.examId = examCourseDto.getExamId();
+        this.examName = examCourseDto.getExamName();
+        this.courseCode = examCourseDto.getCourseCode();
+        this.courseName = examCourseDto.getCourseName();
+        this.examType = examCourseDto.getExamType().name();
+    }
+
+    public Long getExamId() {
         return examId;
     }
 
@@ -152,120 +153,120 @@ public class ExtractConfig implements Serializable {
     public void setPolicy(ExtractPolicy policy) {
         this.policy = policy;
     }
-    
+
     public String getExamType() {
-		return examType;
-	}
-
-	public void setExamType(String examType) {
-		this.examType = examType;
-	}
-
-	public String getExamName() {
-		return examName;
-	}
-
-	public void setExamName(String examName) {
-		this.examName = examName;
-	}
-
-	public String getCourseName() {
-		return courseName;
-	}
-
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
-
-	public String getCallType() {
-		return callType;
-	}
-
-	public void setCallType(String callType) {
-		this.callType = callType;
-	}
-
-	public Short getIfFinish() {
-		return ifFinish;
-	}
-
-	public void setIfFinish(Short ifFinish) {
-		if(ifFinish==null){
-			this.ifFinish = 0;
-		}else{
-			this.ifFinish = ifFinish;
-		}
-	}
-
-	public Map<String,Object> getParams() {
+        return examType;
+    }
+
+    public void setExamType(String examType) {
+        this.examType = examType;
+    }
+
+    public String getExamName() {
+        return examName;
+    }
+
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getCallType() {
+        return callType;
+    }
+
+    public void setCallType(String callType) {
+        this.callType = callType;
+    }
+
+    public Short getIfFinish() {
+        return ifFinish;
+    }
+
+    public void setIfFinish(Short ifFinish) {
+        if (ifFinish == null) {
+            this.ifFinish = 0;
+        } else {
+            this.ifFinish = ifFinish;
+        }
+    }
+
+    public Map<String, Object> getParams() {
         return params;
     }
 
-    public void setParams(Map<String,Object> params) {
+    public void setParams(Map<String, Object> params) {
         this.params = params;
     }
 
-	public String getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(String orgId) {
-		this.orgId = orgId;
-	}
-
-	public List<ExamPaper> getExamPaperList() {
-		return examPaperList;
-	}
-
-	public void setExamPaperList(List<ExamPaper> examPaperList) {
-		this.examPaperList = examPaperList;
-	}
-
-	public Short getScrambling_the_question_order() {
-		return scrambling_the_question_order;
-	}
-
-	public void setScrambling_the_question_order(Short scrambling_the_question_order) {
-		if(scrambling_the_question_order==null){
-			this.scrambling_the_question_order = 0;
-		}else{
-			this.scrambling_the_question_order = scrambling_the_question_order;
-		}
-	}
-
-	public Short getScrambling_the_option_order() {
-		return scrambling_the_option_order;
-	}
-
-	public void setScrambling_the_option_order(Short scrambling_the_option_order) {
-		if(scrambling_the_option_order==null){
-			this.scrambling_the_option_order = 0;
-		}else{
-			this.scrambling_the_option_order = scrambling_the_option_order;
-		}
-	}
-
-	public Map<String, String> getFinishedPaperIdMap() {
-		return finishedPaperIdMap;
-	}
-
-	public void setFinishedPaperIdMap(Map<String, String> finishedPaperIdMap) {
-		this.finishedPaperIdMap = finishedPaperIdMap;
-	}
-
-	public String getOrgName() {
-		return orgName;
-	}
-
-	public void setOrgName(String orgName) {
-		this.orgName = orgName;
-	}
-
-	public Course getCourse() {
-		return course;
-	}
-
-	public void setCourse(Course course) {
-		this.course = course;
-	}
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
+    public List<ExamPaper> getExamPaperList() {
+        return examPaperList;
+    }
+
+    public void setExamPaperList(List<ExamPaper> examPaperList) {
+        this.examPaperList = examPaperList;
+    }
+
+    public Short getScrambling_the_question_order() {
+        return scrambling_the_question_order;
+    }
+
+    public void setScrambling_the_question_order(Short scrambling_the_question_order) {
+        if (scrambling_the_question_order == null) {
+            this.scrambling_the_question_order = 0;
+        } else {
+            this.scrambling_the_question_order = scrambling_the_question_order;
+        }
+    }
+
+    public Short getScrambling_the_option_order() {
+        return scrambling_the_option_order;
+    }
+
+    public void setScrambling_the_option_order(Short scrambling_the_option_order) {
+        if (scrambling_the_option_order == null) {
+            this.scrambling_the_option_order = 0;
+        } else {
+            this.scrambling_the_option_order = scrambling_the_option_order;
+        }
+    }
+
+    public Map<String, String> getFinishedPaperIdMap() {
+        return finishedPaperIdMap;
+    }
+
+    public void setFinishedPaperIdMap(Map<String, String> finishedPaperIdMap) {
+        this.finishedPaperIdMap = finishedPaperIdMap;
+    }
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
+    public Course getCourse() {
+        return course;
+    }
+
+    public void setCourse(Course course) {
+        this.course = course;
+    }
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/ImportPaperMsg.java

@@ -1,82 +1,83 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity;
+
 /**
- * @author  	chenken
- * @date    	2017年6月8日 下午2:46:09
- * @company 	QMTH
+ * @author chenken
+ * @date 2017年6月8日 下午2:46:09
+ * @company QMTH
  * @description ImportPaperMsg.java
  */
 public class ImportPaperMsg {
-	/**
-	 * [试题分类]
-	 */
-	public static final String questionClassify_word = "[试题分类]";
-	/**
-	 * [题型]
-	 */
-	public static final String questionType_word = "[题型]";
-	/**
-	 * [小题型]
-	 */
+    /**
+     * [试题分类]
+     */
+    public static final String questionClassify_word = "[试题分类]";
+    /**
+     * [题型]
+     */
+    public static final String questionType_word = "[题型]";
+    /**
+     * [小题型]
+     */
     public static final String subQuestionType_word = "[小题型]";
     /**
-	 * [试题编号]
-	 */
+     * [试题编号]
+     */
     public static final String questionNo_word = "[试题编号]";
     /**
-	 * [命题人]
-	 */
+     * [命题人]
+     */
     public static final String question_creator = "[命题人]";
     /**
-	 * [题干]
-	 */
+     * [题干]
+     */
     public static final String questionBody_word = "[题干]";
     /**
-	 * [选项]
-	 */
+     * [选项]
+     */
     public static final String option_word = "[选项]";
     /**
-	 * [答案]
-	 */
+     * [答案]
+     */
     public static final String answer_word = "[答案]";
     /**
-	 * [属性]
-	 */
+     * [属性]
+     */
     public static final String attribute_word = "[属性]";
     /**
-	 * [适用年级]
-	 */
+     * [适用年级]
+     */
     public static final String grade_word = "[适用年级]";
     /**
-	 * [测评项目]
-	 */
+     * [测评项目]
+     */
     public static final String course_word = "[测评项目]";
     /**
      * [分数]
      */
     public static final String score_word = "[分数]";
     /**
-	 * [小题分数]
-	 */
+     * [小题分数]
+     */
     public static final String subQuesScore_word = "[小题分数]";
     /**
-	 * [解析]
-	 */
+     * [解析]
+     */
     public static final String analyze_word = "[解析]";
     /**
-     *[题目数量]
+     * [题目数量]
      */
     public static final String questionNum_word = "[题目数量]";
     /**
-	 *[题组数量]
-	 */
+     * [题组数量]
+     */
     public static final String subQuestionNum_word = "[题组数量]";
     /**
-	 * 套题
-	 */
+     * 套题
+     */
     public static final String nestedQuestion_word = "套题";
     /**
-	 * [大题名称]
-	 */
+     * [大题名称]
+     */
     public static final String questionName_word = "[大题名称]";
     /**
      * 单选
@@ -147,7 +148,7 @@ public class ImportPaperMsg {
      * 选项排列顺序
      */
     public static final String errMsg_13 = "格式错误,请仔细检查(1、选项序号有误,必须从A开始且按字母顺序排列ABCDEF；2、选项内容不对)";
-    
+
     /**
      * [一级属性]
      */

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/Paper.java

@@ -17,7 +17,6 @@ import cn.com.qmth.examcloud.core.questions.base.core.enums.CourseLevel;
 
 /**
  * @author songyue
- *
  */
 public class Paper implements Serializable {
 
@@ -58,21 +57,21 @@ public class Paper implements Serializable {
     private String courseName;
 
     private Course course;
-    
+
     private CourseLevel level;
 
     private String orgId;
 
     private Map<String, String> params;// 导入试卷属性
-    
+
     private Specialty specialty;
-    
-    private Double difficultyDegree ; //难度系数
-    
+
+    private Double difficultyDegree; //难度系数
+
     private String sameName; //相同大题名 0：不合并，1：合并
-    
+
     private String examRemark;//考试说明
-    
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -217,15 +216,15 @@ public class Paper implements Serializable {
         this.createTime = CommonUtils.getCurDateTime();
     }
 
-	public CourseLevel getLevel() {
-		return level;
-	}
+    public CourseLevel getLevel() {
+        return level;
+    }
 
-	public void setLevel(CourseLevel level) {
-		this.level = level;
-	}
+    public void setLevel(CourseLevel level) {
+        this.level = level;
+    }
 
-	public Course getCourse() {
+    public Course getCourse() {
         return course;
     }
 
@@ -233,36 +232,36 @@ public class Paper implements Serializable {
         this.course = course;
     }
 
-	public Specialty getSpecialty() {
-		return specialty;
-	}
+    public Specialty getSpecialty() {
+        return specialty;
+    }
 
-	public void setSpecialty(Specialty specialty) {
-		this.specialty = specialty;
-	}
+    public void setSpecialty(Specialty specialty) {
+        this.specialty = specialty;
+    }
+
+    public Double getDifficultyDegree() {
+        return difficultyDegree;
+    }
 
-	public Double getDifficultyDegree() {
-		return difficultyDegree;
-	}
+    public void setDifficultyDegree(Double difficultyDegree) {
+        this.difficultyDegree = difficultyDegree;
+    }
 
-	public void setDifficultyDegree(Double difficultyDegree) {
-		this.difficultyDegree = difficultyDegree;
-	}
+    public String getSameName() {
+        return sameName;
+    }
 
-	public String getSameName() {
-		return sameName;
-	}
+    public void setSameName(String sameName) {
+        this.sameName = sameName;
+    }
 
-	public void setSameName(String sameName) {
-		this.sameName = sameName;
-	}
+    public String getExamRemark() {
+        return examRemark;
+    }
 
-	public String getExamRemark() {
-		return examRemark;
-	}
+    public void setExamRemark(String examRemark) {
+        this.examRemark = examRemark;
+    }
 
-	public void setExamRemark(String examRemark) {
-		this.examRemark = examRemark;
-	}
-	
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/PaperDetail.java

@@ -6,7 +6,7 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.DBRef;
 
 
-public class PaperDetail implements Serializable,Comparable<PaperDetail> {
+public class PaperDetail implements Serializable, Comparable<PaperDetail> {
 
     private static final long serialVersionUID = 6674961232283369404L;
 
@@ -109,17 +109,17 @@ public class PaperDetail implements Serializable,Comparable<PaperDetail> {
     @Override
     public int compareTo(PaperDetail paperDetail) {
         if (paperDetail != null) {
-            if(this.getNumber() == null)return -1;
-            if(paperDetail.getNumber() == null)return 1;
+            if (this.getNumber() == null) return -1;
+            if (paperDetail.getNumber() == null) return 1;
             if (this.getNumber() > paperDetail.getNumber()) {
                 return 1;
             } else if (this.getNumber() < paperDetail.getNumber()) {
                 return -1;
-            }else{
+            } else {
                 return 0;
             }
         }
         return -1;
     }
-    
+
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/PaperDetailStruct.java

@@ -13,212 +13,212 @@ import java.util.List;
  * Created by songyue on 16/12/28.
  */
 
-public class PaperDetailStruct implements Serializable{
-	
-	private static final long serialVersionUID = -1102384643351847702L;
-
-	private String id;
-	
-	private Integer number;//大题序号
-	
-	private String name;//大题名称
-	
-	private List<PaperDetailUnitStruct> paperDetailUnitStructs;//小题明细
-
-	private List<PaperDetailUnitStructDto> unitStructs;//题目类型统计
-
-	private Double totalScore;//大题总分
-	
-	@SuppressWarnings("rawtypes")
-	private Map params;//大题参数
-
-	private String remark;
-
-	private Integer detailCount; //小题总数
-	
-	/**
-	 * 蓝图结构字段
-	 */
-	private QuesStructType questionType; //题型
-	
-	private Double score; //小题分数
-	
-	private List<String> quesNames;//来源大题
-	
-	private Integer publicSimpleCount; //公开简单总数
-	
-	private Integer publicMediumCount; //公开中等总数
-	
-	private Integer publicDifficultyCount; //公开困难总数
-	
-	private Integer noPublicSimpleCount; //非公开简单总数
-	
-	private Integer noPublicMediumCount; //非公开中等总数
-	
-	private Integer noPublicDifficultyCount; //非公开困难总数  coursePropertyNumberDtos
-	
-	private List<CoursePropertyNumberDto> coursePropertyNumberDtos;
-	
-	public static long getSerialVersionUID() {
-		return serialVersionUID;
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public Integer getNumber() {
-		return number;
-	}
-
-	public void setNumber(Integer number) {
-		this.number = number;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public List<PaperDetailUnitStruct> getPaperDetailUnitStructs() {
-		return paperDetailUnitStructs;
-	}
-
-	public void setPaperDetailUnitStructs(List<PaperDetailUnitStruct> paperDetailUnitStructs) {
-		this.paperDetailUnitStructs = paperDetailUnitStructs;
-	}
-
-	public List<PaperDetailUnitStructDto> getUnitStructs() {
-		return unitStructs;
-	}
-
-	public void setUnitStructs(List<PaperDetailUnitStructDto> unitStructs) {
-		this.unitStructs = unitStructs;
-	}
-
-	public Double getTotalScore() {
-		return totalScore;
-	}
-
-	public void setTotalScore(Double totalScore) {
-		this.totalScore = totalScore;
-	}
-
-	@SuppressWarnings("rawtypes")
-	public Map getParams() {
-		return params;
-	}
-
-	@SuppressWarnings("rawtypes")
-	public void setParams(Map params) {
-		this.params = params;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public Integer getDetailCount() {
-		return detailCount;
-	}
-
-	public void setDetailCount(Integer detailCount) {
-		this.detailCount = detailCount;
-	}
-
-	public PaperDetailStruct() {
-	}
-
-	public QuesStructType getQuestionType() {
-		return questionType;
-	}
-
-	public void setQuestionType(QuesStructType questionType) {
-		this.questionType = questionType;
-	}
-
-	public Double getScore() {
-		return score;
-	}
-
-	public void setScore(Double score) {
-		this.score = score;
-	}
-
-	public List<String> getQuesNames() {
-		return quesNames;
-	}
-
-	public void setQuesNames(List<String> quesNames) {
-		this.quesNames = quesNames;
-	}
-
-	public Integer getPublicSimpleCount() {
-		return publicSimpleCount;
-	}
-
-	public void setPublicSimpleCount(Integer publicSimpleCount) {
-		this.publicSimpleCount = publicSimpleCount;
-	}
-
-	public Integer getPublicMediumCount() {
-		return publicMediumCount;
-	}
-
-	public void setPublicMediumCount(Integer publicMediumCount) {
-		this.publicMediumCount = publicMediumCount;
-	}
-
-	public Integer getPublicDifficultyCount() {
-		return publicDifficultyCount;
-	}
-
-	public void setPublicDifficultyCount(Integer publicDifficultyCount) {
-		this.publicDifficultyCount = publicDifficultyCount;
-	}
-
-	public Integer getNoPublicSimpleCount() {
-		return noPublicSimpleCount;
-	}
-
-	public void setNoPublicSimpleCount(Integer noPublicSimpleCount) {
-		this.noPublicSimpleCount = noPublicSimpleCount;
-	}
-
-	public Integer getNoPublicMediumCount() {
-		return noPublicMediumCount;
-	}
-
-	public void setNoPublicMediumCount(Integer noPublicMediumCount) {
-		this.noPublicMediumCount = noPublicMediumCount;
-	}
-
-	public Integer getNoPublicDifficultyCount() {
-		return noPublicDifficultyCount;
-	}
-
-	public void setNoPublicDifficultyCount(Integer noPublicDifficultyCount) {
-		this.noPublicDifficultyCount = noPublicDifficultyCount;
-	}
-
-	public List<CoursePropertyNumberDto> getCoursePropertyNumberDtos() {
-		return coursePropertyNumberDtos;
-	}
+public class PaperDetailStruct implements Serializable {
 
-	public void setCoursePropertyNumberDtos(
-			List<CoursePropertyNumberDto> coursePropertyNumberDtos) {
-		this.coursePropertyNumberDtos = coursePropertyNumberDtos;
-	}
+    private static final long serialVersionUID = -1102384643351847702L;
+
+    private String id;
+
+    private Integer number;//大题序号
+
+    private String name;//大题名称
+
+    private List<PaperDetailUnitStruct> paperDetailUnitStructs;//小题明细
+
+    private List<PaperDetailUnitStructDto> unitStructs;//题目类型统计
+
+    private Double totalScore;//大题总分
+
+    @SuppressWarnings("rawtypes")
+    private Map params;//大题参数
+
+    private String remark;
+
+    private Integer detailCount; //小题总数
+
+    /**
+     * 蓝图结构字段
+     */
+    private QuesStructType questionType; //题型
+
+    private Double score; //小题分数
+
+    private List<String> quesNames;//来源大题
+
+    private Integer publicSimpleCount; //公开简单总数
+
+    private Integer publicMediumCount; //公开中等总数
+
+    private Integer publicDifficultyCount; //公开困难总数
+
+    private Integer noPublicSimpleCount; //非公开简单总数
+
+    private Integer noPublicMediumCount; //非公开中等总数
+
+    private Integer noPublicDifficultyCount; //非公开困难总数  coursePropertyNumberDtos
+
+    private List<CoursePropertyNumberDto> coursePropertyNumberDtos;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<PaperDetailUnitStruct> getPaperDetailUnitStructs() {
+        return paperDetailUnitStructs;
+    }
+
+    public void setPaperDetailUnitStructs(List<PaperDetailUnitStruct> paperDetailUnitStructs) {
+        this.paperDetailUnitStructs = paperDetailUnitStructs;
+    }
+
+    public List<PaperDetailUnitStructDto> getUnitStructs() {
+        return unitStructs;
+    }
+
+    public void setUnitStructs(List<PaperDetailUnitStructDto> unitStructs) {
+        this.unitStructs = unitStructs;
+    }
+
+    public Double getTotalScore() {
+        return totalScore;
+    }
+
+    public void setTotalScore(Double totalScore) {
+        this.totalScore = totalScore;
+    }
+
+    @SuppressWarnings("rawtypes")
+    public Map getParams() {
+        return params;
+    }
+
+    @SuppressWarnings("rawtypes")
+    public void setParams(Map params) {
+        this.params = params;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Integer getDetailCount() {
+        return detailCount;
+    }
+
+    public void setDetailCount(Integer detailCount) {
+        this.detailCount = detailCount;
+    }
+
+    public PaperDetailStruct() {
+    }
+
+    public QuesStructType getQuestionType() {
+        return questionType;
+    }
+
+    public void setQuestionType(QuesStructType questionType) {
+        this.questionType = questionType;
+    }
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+
+    public List<String> getQuesNames() {
+        return quesNames;
+    }
+
+    public void setQuesNames(List<String> quesNames) {
+        this.quesNames = quesNames;
+    }
+
+    public Integer getPublicSimpleCount() {
+        return publicSimpleCount;
+    }
+
+    public void setPublicSimpleCount(Integer publicSimpleCount) {
+        this.publicSimpleCount = publicSimpleCount;
+    }
+
+    public Integer getPublicMediumCount() {
+        return publicMediumCount;
+    }
+
+    public void setPublicMediumCount(Integer publicMediumCount) {
+        this.publicMediumCount = publicMediumCount;
+    }
+
+    public Integer getPublicDifficultyCount() {
+        return publicDifficultyCount;
+    }
+
+    public void setPublicDifficultyCount(Integer publicDifficultyCount) {
+        this.publicDifficultyCount = publicDifficultyCount;
+    }
+
+    public Integer getNoPublicSimpleCount() {
+        return noPublicSimpleCount;
+    }
+
+    public void setNoPublicSimpleCount(Integer noPublicSimpleCount) {
+        this.noPublicSimpleCount = noPublicSimpleCount;
+    }
+
+    public Integer getNoPublicMediumCount() {
+        return noPublicMediumCount;
+    }
+
+    public void setNoPublicMediumCount(Integer noPublicMediumCount) {
+        this.noPublicMediumCount = noPublicMediumCount;
+    }
+
+    public Integer getNoPublicDifficultyCount() {
+        return noPublicDifficultyCount;
+    }
+
+    public void setNoPublicDifficultyCount(Integer noPublicDifficultyCount) {
+        this.noPublicDifficultyCount = noPublicDifficultyCount;
+    }
+
+    public List<CoursePropertyNumberDto> getCoursePropertyNumberDtos() {
+        return coursePropertyNumberDtos;
+    }
+
+    public void setCoursePropertyNumberDtos(
+            List<CoursePropertyNumberDto> coursePropertyNumberDtos) {
+        this.coursePropertyNumberDtos = coursePropertyNumberDtos;
+    }
 
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/PaperDetailUnit.java

@@ -48,17 +48,18 @@ public class PaperDetailUnit implements Serializable, Comparable<PaperDetailUnit
     private String creator;// 创建人id
 
     private String createTime;// 创建时间
-    
+
     private PaperType paperType;
-    
+
     /**
-	 * 作答限时 K12
-	 */
-	private Long timeLimit;
-    
-    public PaperDetailUnit() {}
-    
-    public PaperDetailUnit(Paper paper,PaperDetail paperDetail,Question question) {
+     * 作答限时 K12
+     */
+    private Long timeLimit;
+
+    public PaperDetailUnit() {
+    }
+
+    public PaperDetailUnit(Paper paper, PaperDetail paperDetail, Question question) {
         this.paper = paper;
         this.questionType = question.getQuestionType();
         this.question = question;
@@ -182,20 +183,20 @@ public class PaperDetailUnit implements Serializable, Comparable<PaperDetailUnit
     public void setOptionOrder(String optionOrder) {
         this.optionOrder = optionOrder;
     }
-    
+
     public PaperType getPaperType() {
-		return paperType;
-	}
-
-	public void setPaperType(PaperType paperType) {
-		if(paper!=null){
-			this.paperType = paper.getPaperType();
-		}else{
-			this.paperType = paperType;
-		}
-	}
-
-	public void setSubScoreList(List<Double> subScoreList) {
+        return paperType;
+    }
+
+    public void setPaperType(PaperType paperType) {
+        if (paper != null) {
+            this.paperType = paper.getPaperType();
+        } else {
+            this.paperType = paperType;
+        }
+    }
+
+    public void setSubScoreList(List<Double> subScoreList) {
         this.subScoreList = subScoreList;
         if (subScoreList != null) {
             double totalScore = 0;
@@ -212,16 +213,16 @@ public class PaperDetailUnit implements Serializable, Comparable<PaperDetailUnit
     public void setSubScoreListNew(List<Double> subScoreList) {
         this.subScoreList = subScoreList;
     }
-    
-	public Long getTimeLimit() {
-		return timeLimit;
-	}
 
-	public void setTimeLimit(Long timeLimit) {
-		this.timeLimit = timeLimit;
-	}
+    public Long getTimeLimit() {
+        return timeLimit;
+    }
+
+    public void setTimeLimit(Long timeLimit) {
+        this.timeLimit = timeLimit;
+    }
 
-	@Override
+    @Override
     public int compareTo(PaperDetailUnit unit) {
         /*if (unit != null) {
             if (this.getQuestionType().getId() > unit.getQuestionType().getId()) {
@@ -231,13 +232,13 @@ public class PaperDetailUnit implements Serializable, Comparable<PaperDetailUnit
             }
         }*/
         if (unit != null) {
-            if(this.getNumber() == null)return -1;
-            if(unit.getNumber() == null)return 1;
+            if (this.getNumber() == null) return -1;
+            if (unit.getNumber() == null) return 1;
             if (this.getNumber() > unit.getNumber()) {
                 return 1;
             } else if (this.getNumber() < unit.getNumber()) {
                 return -1;
-            }else{
+            } else {
                 return 0;
             }
         }
@@ -277,43 +278,43 @@ public class PaperDetailUnit implements Serializable, Comparable<PaperDetailUnit
         return CommonUtils.formatDouble(totalScore);
     }
 
-    public int getDetailNumber(){
+    public int getDetailNumber() {
         return this.paperDetail.getNumber();
     }
 
-    public String getDetailId(){
+    public String getDetailId() {
         return this.paperDetail.getId();
     }
 
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result
-				+ ((question == null) ? 0 : question.getId().hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj){
-			return true;
-		}
-		if (obj == null){
-			return false;
-		}
-		if (getClass() != obj.getClass()){
-			return false;
-		}
-		PaperDetailUnit other = (PaperDetailUnit) obj;
-		if (question == null) {
-			if (other.question != null){
-				return false;
-			}
-		} else if (!question.getId().equals(other.question.getId())){
-			return false;
-		}
-		return true;
-	}
-    
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result
+                + ((question == null) ? 0 : question.getId().hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        PaperDetailUnit other = (PaperDetailUnit) obj;
+        if (question == null) {
+            if (other.question != null) {
+                return false;
+            }
+        } else if (!question.getId().equals(other.question.getId())) {
+            return false;
+        }
+        return true;
+    }
+
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/PaperDetailUnitStruct.java

@@ -23,40 +23,40 @@ public class PaperDetailUnitStruct implements Serializable {
     private QuesStructType questionType;//小题类型
 
     private List<String> quesNames;//来源大题
-    
+
     private String propertyId; //属性名
-    
+
     private String difficulty; //难度
-    
+
     private Boolean publicity; //公开度
-    
+
     private String propertyGroup; //单个属性组（用来筛选题目）
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
 
-    public PaperDetailUnitStruct(){
-    	
+    public PaperDetailUnitStruct() {
+
     }
-    
-    public PaperDetailUnitStruct(PaperDetailStruct paperDetailStruct,int number,CoursePropertyNumberDto coursePropertyNumberDto){
-    	this.setScore(paperDetailStruct.getScore());
-    	this.setId(String.valueOf(number));
-    	this.setNumber(number);
-    	this.setQuestionType(paperDetailStruct.getQuestionType());
-    	this.setQuesNames(paperDetailStruct.getQuesNames());
-    	this.setPropertyId(buildPropertyId(coursePropertyNumberDto));
+
+    public PaperDetailUnitStruct(PaperDetailStruct paperDetailStruct, int number, CoursePropertyNumberDto coursePropertyNumberDto) {
+        this.setScore(paperDetailStruct.getScore());
+        this.setId(String.valueOf(number));
+        this.setNumber(number);
+        this.setQuestionType(paperDetailStruct.getQuestionType());
+        this.setQuesNames(paperDetailStruct.getQuesNames());
+        this.setPropertyId(buildPropertyId(coursePropertyNumberDto));
     }
-    
-    private String buildPropertyId(CoursePropertyNumberDto coursePropertyNumberDto){
-    	//有一级属性和二姐属性
-    	if(coursePropertyNumberDto.getPropertyParentId() != 0){
-    		return coursePropertyNumberDto.getPropertyParentId() + "-" + coursePropertyNumberDto.getPropertyId();
-    	}
-    	return String.valueOf(coursePropertyNumberDto.getPropertyId());
+
+    private String buildPropertyId(CoursePropertyNumberDto coursePropertyNumberDto) {
+        //有一级属性和二姐属性
+        if (coursePropertyNumberDto.getPropertyParentId() != 0) {
+            return coursePropertyNumberDto.getPropertyParentId() + "-" + coursePropertyNumberDto.getPropertyId();
+        }
+        return String.valueOf(coursePropertyNumberDto.getPropertyId());
     }
-    
+
     public String getId() {
         return id;
     }
@@ -97,40 +97,40 @@ public class PaperDetailUnitStruct implements Serializable {
         this.quesNames = quesNames;
     }
 
-	public Boolean getPublicity() {
-		return publicity;
-	}
+    public Boolean getPublicity() {
+        return publicity;
+    }
 
-	public void setPublicity(Boolean publicity) {
-		this.publicity = publicity;
-	}
+    public void setPublicity(Boolean publicity) {
+        this.publicity = publicity;
+    }
 
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
+    public static long getSerialversionuid() {
+        return serialVersionUID;
+    }
 
-	public String getDifficulty() {
-		return difficulty;
-	}
+    public String getDifficulty() {
+        return difficulty;
+    }
 
-	public void setDifficulty(String difficulty) {
-		this.difficulty = difficulty;
-	}
+    public void setDifficulty(String difficulty) {
+        this.difficulty = difficulty;
+    }
 
-	public String getPropertyId() {
-		return propertyId;
-	}
+    public String getPropertyId() {
+        return propertyId;
+    }
 
-	public void setPropertyId(String propertyId) {
-		this.propertyId = propertyId;
-	}
+    public void setPropertyId(String propertyId) {
+        this.propertyId = propertyId;
+    }
+
+    public String getPropertyGroup() {
+        return propertyGroup;
+    }
 
-	public String getPropertyGroup() {
-		return propertyGroup;
-	}
+    public void setPropertyGroup(String propertyGroup) {
+        this.propertyGroup = propertyGroup;
+    }
 
-	public void setPropertyGroup(String propertyGroup) {
-		this.propertyGroup = propertyGroup;
-	}
-	
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/PaperSearchInfo.java

@@ -15,9 +15,9 @@ public class PaperSearchInfo implements Serializable {
     private String creator;// 录入员
 
     private String courseNo;// 课程代码
-    
+
     private String specialtyNo;// 专业代码
-    
+
     private String level;// 层次
 
     private String orgId;// 机构Id
@@ -86,20 +86,20 @@ public class PaperSearchInfo implements Serializable {
         this.paperStatus = paperStatus;
     }
 
-	public String getSpecialtyNo() {
-		return specialtyNo;
-	}
+    public String getSpecialtyNo() {
+        return specialtyNo;
+    }
 
-	public void setSpecialtyNo(String specialtyNo) {
-		this.specialtyNo = specialtyNo;
-	}
+    public void setSpecialtyNo(String specialtyNo) {
+        this.specialtyNo = specialtyNo;
+    }
 
-	public String getLevel() {
-		return level;
-	}
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
 
-	public void setLevel(String level) {
-		this.level = level;
-	}
-    
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/PaperStruct.java

@@ -32,7 +32,7 @@ public class PaperStruct implements Serializable {
     private Integer detailUnitCount;//小题数量
 
     @SuppressWarnings("rawtypes")
-	private Map params;
+    private Map params;
 
     private List<PaperDetailStruct> paperDetailStructs;// 大题
 
@@ -43,27 +43,27 @@ public class PaperStruct implements Serializable {
     private String orgId;// 机构ID
 
     private String courseNo;
-    
+
     private String courseName;
-    
+
     /**
      * 试卷结构类型  ：  精确组卷    蓝图组卷
      */
     private PaperStructType paperStrucType;
-    
+
     private String type;
-    
+
     /**
      * 组卷类型     ： 精细组卷      宏观组卷
      */
     private GenPaperType genPaperType;
-    
+
     private Long coursePropertyId; //课程属性id
-    
+
     private Double difficulty; //难度
-    
+
     private String examRemark;//考试说明
-    
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -101,12 +101,12 @@ public class PaperStruct implements Serializable {
     }
 
     @SuppressWarnings("rawtypes")
-	public Map getParams() {
+    public Map getParams() {
         return params;
     }
 
     @SuppressWarnings("rawtypes")
-	public void setParams(Map params) {
+    public void setParams(Map params) {
         this.params = params;
     }
 
@@ -162,60 +162,60 @@ public class PaperStruct implements Serializable {
         this.detailUnitCount = detailUnitCount;
     }
 
-	public GenPaperType getGenPaperType() {
-		return genPaperType;
-	}
+    public GenPaperType getGenPaperType() {
+        return genPaperType;
+    }
 
-	public void setGenPaperType(GenPaperType genPaperType) {
-		this.genPaperType = genPaperType;
-	}
+    public void setGenPaperType(GenPaperType genPaperType) {
+        this.genPaperType = genPaperType;
+    }
 
-	public PaperStructType getPaperStrucType() {
-		return paperStrucType;
-	}
+    public PaperStructType getPaperStrucType() {
+        return paperStrucType;
+    }
 
-	public void setPaperStrucType(PaperStructType paperStrucType) {
-		this.paperStrucType = paperStrucType;
-	}
+    public void setPaperStrucType(PaperStructType paperStrucType) {
+        this.paperStrucType = paperStrucType;
+    }
 
-	public String getType() {
-		return type;
-	}
+    public String getType() {
+        return type;
+    }
 
-	public void setType(String type) {
-		this.type = type;
-	}
+    public void setType(String type) {
+        this.type = type;
+    }
 
-	public Long getCoursePropertyId() {
-		return coursePropertyId;
-	}
+    public Long getCoursePropertyId() {
+        return coursePropertyId;
+    }
 
-	public void setCoursePropertyId(Long coursePropertyId) {
-		this.coursePropertyId = coursePropertyId;
-	}
+    public void setCoursePropertyId(Long coursePropertyId) {
+        this.coursePropertyId = coursePropertyId;
+    }
 
-	public Double getDifficulty() {
-		return difficulty;
-	}
+    public Double getDifficulty() {
+        return difficulty;
+    }
 
-	public void setDifficulty(Double difficulty) {
-		this.difficulty = difficulty;
-	}
+    public void setDifficulty(Double difficulty) {
+        this.difficulty = difficulty;
+    }
 
-	public String getExamRemark() {
-		return examRemark;
-	}
+    public String getExamRemark() {
+        return examRemark;
+    }
 
-	public void setExamRemark(String examRemark) {
-		this.examRemark = examRemark;
-	}
+    public void setExamRemark(String examRemark) {
+        this.examRemark = examRemark;
+    }
 
-	public String getCourseName() {
-		return courseName;
-	}
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
 
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
-	
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/PaperStructSearchInfo.java

@@ -18,7 +18,7 @@ public class PaperStructSearchInfo implements Serializable {
     private String orgId;
 
     private String courseNo;
-    
+
     private String type;
 
     public static long getSerialVersionUID() {
@@ -65,12 +65,12 @@ public class PaperStructSearchInfo implements Serializable {
         this.courseNo = courseNo;
     }
 
-	public String getType() {
-		return type;
-	}
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 
-	public void setType(String type) {
-		this.type = type;
-	}
-    
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuesOption.java

@@ -5,9 +5,9 @@ import java.io.Serializable;
 /**
  * Created by songyue on 16/12/27.
  */
-public class QuesOption implements Serializable{
+public class QuesOption implements Serializable {
     private static final long serialVersionUID = 6187112681135912330L;
-    
+
     /**
      * 选项编号
      * 在第一次导入或者新建题目时初始化，
@@ -18,7 +18,7 @@ public class QuesOption implements Serializable{
     private String optionBody;//选项内容
 
     private String optionBodyWord;//选项word
-    /** 
+    /**
      * 是否是正确答案  1:是  0:否
      */
     private short isCorrect;
@@ -51,14 +51,15 @@ public class QuesOption implements Serializable{
         this.optionBodyWord = optionBodyWord;
     }
 
-    public QuesOption() {}
+    public QuesOption() {
+    }
+
+    public short getIsCorrect() {
+        return isCorrect;
+    }
 
-	public short getIsCorrect() {
-		return isCorrect;
-	}
+    public void setIsCorrect(short isCorrect) {
+        this.isCorrect = isCorrect;
+    }
 
-	public void setIsCorrect(short isCorrect) {
-		this.isCorrect = isCorrect;
-	}
-	
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuesProperty.java

@@ -3,87 +3,88 @@ package cn.com.qmth.examcloud.core.questions.dao.entity;
 import java.io.Serializable;
 
 import cn.com.qmth.examcloud.core.questions.dao.entity.Property;
-public class QuesProperty implements Serializable{
-
-	private static final long serialVersionUID = -2303143377325064933L;
-	
-	private String id;
-	
-	private String coursePropertyName;//课程属性名
-
-	private Property firstProperty;//一级属性
-	
-	private Property secondProperty;//二级属性
-	
-	public QuesProperty(){
-		
-	}
-	
-	public QuesProperty(Property firstProperty,Property secondProperty,CourseProperty courseProperty){
-		this.firstProperty = firstProperty;
-		this.secondProperty = secondProperty;
-		this.coursePropertyName = courseProperty.getName();
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public Property getFirstProperty() {
-		return firstProperty;
-	}
-
-	public void setFirstProperty(Property firstProperty) {
-		this.firstProperty = firstProperty;
-	}
-
-	public Property getSecondProperty() {
-		return secondProperty;
-	}
-
-	public void setSecondProperty(Property secondProperty) {
-		this.secondProperty = secondProperty;
-	}
-
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-
-	public String getCoursePropertyName() {
-		return coursePropertyName;
-	}
-
-	public void setCoursePropertyName(String coursePropertyName) {
-		this.coursePropertyName = coursePropertyName;
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((id == null) ? 0 : id.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		QuesProperty other = (QuesProperty) obj;
-		if (id == null) {
-			if (other.id != null)
-				return false;
-		} else if (!id.equals(other.id))
-			return false;
-		return true;
-	}
-	
+
+public class QuesProperty implements Serializable {
+
+    private static final long serialVersionUID = -2303143377325064933L;
+
+    private String id;
+
+    private String coursePropertyName;//课程属性名
+
+    private Property firstProperty;//一级属性
+
+    private Property secondProperty;//二级属性
+
+    public QuesProperty() {
+
+    }
+
+    public QuesProperty(Property firstProperty, Property secondProperty, CourseProperty courseProperty) {
+        this.firstProperty = firstProperty;
+        this.secondProperty = secondProperty;
+        this.coursePropertyName = courseProperty.getName();
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Property getFirstProperty() {
+        return firstProperty;
+    }
+
+    public void setFirstProperty(Property firstProperty) {
+        this.firstProperty = firstProperty;
+    }
+
+    public Property getSecondProperty() {
+        return secondProperty;
+    }
+
+    public void setSecondProperty(Property secondProperty) {
+        this.secondProperty = secondProperty;
+    }
+
+    public static long getSerialversionuid() {
+        return serialVersionUID;
+    }
+
+    public String getCoursePropertyName() {
+        return coursePropertyName;
+    }
+
+    public void setCoursePropertyName(String coursePropertyName) {
+        this.coursePropertyName = coursePropertyName;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        QuesProperty other = (QuesProperty) obj;
+        if (id == null) {
+            if (other.id != null)
+                return false;
+        } else if (!id.equals(other.id))
+            return false;
+        return true;
+    }
+
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuesResource.java

@@ -7,7 +7,7 @@ import java.io.Serializable;
 /**
  * Created by songyue on 16/12/27.
  */
-public class QuesResource implements Serializable{
+public class QuesResource implements Serializable {
     private static final long serialVersionUID = -6446084924081997140L;
 
     private String resourceNo;//资源编号

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuesTypeName.java

@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * Created by songyue on 17/8/22.
  */
-public class QuesTypeName implements Serializable{
+public class QuesTypeName implements Serializable {
 
     private static final long serialVersionUID = 2084601289212420962L;
 

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/Question.java

@@ -84,40 +84,40 @@ public class Question implements Serializable {
     private List<QuestionAudio> questionAudios;
 
     private String quesName;//来源大题
-    
+
     private Integer number;
-    
+
     private Specialty specialty;
-    
+
     /**
      * 试题属性
      */
     private List<QuesProperty> quesProperties;//关联多组属性
-    
-    private Double difficultyDegree ; //难度系数
-    
+
+    private Double difficultyDegree; //难度系数
+
     private Boolean publicity; //公开度
-    
+
     private String difficulty;// 难度
-    
+
     private List<String> propertyGroup;//试题属性组合（蓝图组卷使用）
-    
+
     /**
      * 试题标签，用于K12做查询条件
      */
     private Map<String, String> properties;
-    
+
     /**
-	 * 是否脱离试卷存在,如果为true,是K12的导入题
-	 */
-	private Boolean isolated;
+     * 是否脱离试卷存在,如果为true,是K12的导入题
+     */
+    private Boolean isolated;
 
     @Transient
     private List<QuestionAudio> audioList;//音频列表(复制试卷使用，不存数据)
 
     public void addAudio(QuestionAudio audio) {
-        if(audioList==null){
-            audioList=new ArrayList<>();
+        if (audioList == null) {
+            audioList = new ArrayList<>();
         }
         audioList.add(audio);
     }
@@ -131,7 +131,7 @@ public class Question implements Serializable {
     }
 
     public static long getSerialVersionUID() {
-    	
+
         return serialVersionUID;
     }
 
@@ -316,21 +316,21 @@ public class Question implements Serializable {
         this.courseMajor = courseMajor;
     }
 
-	public Boolean getHasAudio() {
-		return hasAudio;
-	}
+    public Boolean getHasAudio() {
+        return hasAudio;
+    }
 
-	public void setHasAudio(Boolean hasAudio) {
-		this.hasAudio = hasAudio;
-	}
+    public void setHasAudio(Boolean hasAudio) {
+        this.hasAudio = hasAudio;
+    }
 
-	public List<QuestionAudio> getQuestionAudios() {
-		return questionAudios;
-	}
+    public List<QuestionAudio> getQuestionAudios() {
+        return questionAudios;
+    }
 
-	public void setQuestionAudios(List<QuestionAudio> questionAudios) {
-		this.questionAudios = questionAudios;
-	}
+    public void setQuestionAudios(List<QuestionAudio> questionAudios) {
+        this.questionAudios = questionAudios;
+    }
 
     public Course getCourse() {
         return course;
@@ -348,21 +348,21 @@ public class Question implements Serializable {
         this.quesName = quesName;
     }
 
-	public Integer getNumber() {
-		return number;
-	}
+    public Integer getNumber() {
+        return number;
+    }
 
-	public void setNumber(Integer number) {
-		this.number = number;
-	}
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
 
-	public Specialty getSpecialty() {
-		return specialty;
-	}
+    public Specialty getSpecialty() {
+        return specialty;
+    }
 
-	public void setSpecialty(Specialty specialty) {
-		this.specialty = specialty;
-	}
+    public void setSpecialty(Specialty specialty) {
+        this.specialty = specialty;
+    }
 
     public String getQuesPkgPathId() {
         return quesPkgPathId;
@@ -372,60 +372,60 @@ public class Question implements Serializable {
         this.quesPkgPathId = quesPkgPathId;
     }
 
-	public Boolean getPublicity() {
-		return publicity;
-	}
+    public Boolean getPublicity() {
+        return publicity;
+    }
 
-	public void setPublicity(Boolean publicity) {
-		this.publicity = publicity;
-	}
+    public void setPublicity(Boolean publicity) {
+        this.publicity = publicity;
+    }
 
-	public List<QuesProperty> getQuesProperties() {
-		return quesProperties;
-	}
+    public List<QuesProperty> getQuesProperties() {
+        return quesProperties;
+    }
 
-	public void setQuesProperties(List<QuesProperty> quesProperties) {
-		this.quesProperties = quesProperties;
-	}
+    public void setQuesProperties(List<QuesProperty> quesProperties) {
+        this.quesProperties = quesProperties;
+    }
 
-	public Double getDifficultyDegree() {
-		return difficultyDegree;
-	}
+    public Double getDifficultyDegree() {
+        return difficultyDegree;
+    }
 
-	public void setDifficultyDegree(Double difficultyDegree) {
-		this.difficultyDegree = difficultyDegree;
-	}
+    public void setDifficultyDegree(Double difficultyDegree) {
+        this.difficultyDegree = difficultyDegree;
+    }
 
-	public String getDifficulty() {
-		return difficulty;
-	}
+    public String getDifficulty() {
+        return difficulty;
+    }
 
-	public void setDifficulty(String difficulty) {
-		this.difficulty = difficulty;
-	}
+    public void setDifficulty(String difficulty) {
+        this.difficulty = difficulty;
+    }
 
-	public List<String> getPropertyGroup() {
-		return propertyGroup;
-	}
+    public List<String> getPropertyGroup() {
+        return propertyGroup;
+    }
 
-	public void setPropertyGroup(List<String> propertyGroup) {
-		this.propertyGroup = propertyGroup;
-	}
+    public void setPropertyGroup(List<String> propertyGroup) {
+        this.propertyGroup = propertyGroup;
+    }
 
-	public Map<String, String> getProperties() {
-		return properties;
-	}
+    public Map<String, String> getProperties() {
+        return properties;
+    }
 
-	public void setProperties(Map<String, String> properties) {
-		this.properties = properties;
-	}
+    public void setProperties(Map<String, String> properties) {
+        this.properties = properties;
+    }
 
-	public Boolean getIsolated() {
-		return isolated;
-	}
+    public Boolean getIsolated() {
+        return isolated;
+    }
 
-	public void setIsolated(Boolean isolated) {
-		this.isolated = isolated;
-	}
+    public void setIsolated(Boolean isolated) {
+        this.isolated = isolated;
+    }
 
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuestionAudio.java

@@ -6,103 +6,115 @@ import java.util.Date;
 import org.apache.commons.lang3.StringUtils;
 
 /**
- * @author  	chenken
- * @date    	2017年8月1日 上午10:56:23
- * @company 	QMTH
+ * @author chenken
+ * @date 2017年8月1日 上午10:56:23
+ * @company QMTH
  * @description QuestionAudio.java
  */
-public class QuestionAudio implements Serializable{
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 7190928471784053821L;
-
-	private String id;
-	/**
-	 * 试题ID
-	 */
-	private String questionId;
-	
-	/**
-	 * 题干OR选项
-	private AudioPositionType audioPositionType;
-	
-	*/
-	/**
-	 * 文件名称
-	 */
-	private String fileName;
-	/**
-	 * 文件后缀
-	 */
-	private String fileSuffixes;
-	/**
-	 * 存放路径
-	 */
-	private String fileUrl;
-	/**
-	 * 创建时间
-	 */
-	private Date createTime;
-	/**
-	 * 创建人
-	 */
-	private String createUser;
-	
-	public QuestionAudio(){}
-	
-	public QuestionAudio(String questionId,String fileName,String fileUrl){
-		this.questionId = questionId;
-		this.fileName = fileName;
-		if(StringUtils.isNotBlank(fileName)){
-			this.fileSuffixes = fileName.substring(fileName.indexOf(".")+1,fileName.length());
-		}
-		this.fileUrl = fileUrl;
-	}
-	
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-	public String getQuestionId() {
-		return questionId;
-	}
-	public void setQuestionId(String questionId) {
-		this.questionId = questionId;
-	}
-	public String getFileName() {
-		return fileName;
-	}
-	public void setFileName(String fileName) {
-		this.fileName = fileName;
-	}
-	public String getFileUrl() {
-		return fileUrl;
-	}
-	public void setFileUrl(String fileUrl) {
-		this.fileUrl = fileUrl;
-	}
-	public Date getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-	public String getCreateUser() {
-		return createUser;
-	}
-	public void setCreateUser(String createUser) {
-		this.createUser = createUser;
-	}
-
-	public String getFileSuffixes() {
-		return fileSuffixes;
-	}
-
-	public void setFileSuffixes(String fileSuffixes) {
-		this.fileSuffixes = fileSuffixes;
-	}
-	
+public class QuestionAudio implements Serializable {
+    /**
+     *
+     */
+    private static final long serialVersionUID = 7190928471784053821L;
+
+    private String id;
+    /**
+     * 试题ID
+     */
+    private String questionId;
+
+    /**
+     * 题干OR选项
+     private AudioPositionType audioPositionType;
+
+     */
+    /**
+     * 文件名称
+     */
+    private String fileName;
+    /**
+     * 文件后缀
+     */
+    private String fileSuffixes;
+    /**
+     * 存放路径
+     */
+    private String fileUrl;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 创建人
+     */
+    private String createUser;
+
+    public QuestionAudio() {
+    }
+
+    public QuestionAudio(String questionId, String fileName, String fileUrl) {
+        this.questionId = questionId;
+        this.fileName = fileName;
+        if (StringUtils.isNotBlank(fileName)) {
+            this.fileSuffixes = fileName.substring(fileName.indexOf(".") + 1, fileName.length());
+        }
+        this.fileUrl = fileUrl;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getQuestionId() {
+        return questionId;
+    }
+
+    public void setQuestionId(String questionId) {
+        this.questionId = questionId;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public String getFileUrl() {
+        return fileUrl;
+    }
+
+    public void setFileUrl(String fileUrl) {
+        this.fileUrl = fileUrl;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    public String getFileSuffixes() {
+        return fileSuffixes;
+    }
+
+    public void setFileSuffixes(String fileSuffixes) {
+        this.fileSuffixes = fileSuffixes;
+    }
+
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuestionPkgPath.java

@@ -7,7 +7,7 @@ import java.io.Serializable;
 /**
  * Created by songyue on 17/11/19.
  */
-public class QuestionPkgPath implements Serializable{
+public class QuestionPkgPath implements Serializable {
 
     private static final long serialVersionUID = 1462455654557838793L;
 

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuestionSearchCondition.java

@@ -26,17 +26,17 @@ public class QuestionSearchCondition {
     private String courseLevel;//课程层次
 
     private String courseMajor;//课程专业
-    
+
     private Boolean publicity;//公开度
-    
+
     private String coursePropertyName;//属性名
-    
+
     private String firstPropertyId;//一级属性
-    
+
     private String secondPropertyId;//二级属性
-    
+
     private String difficulty;// 难度
-    
+
     private String quesNames;//来源大题
 
     public String getId() {
@@ -118,52 +118,52 @@ public class QuestionSearchCondition {
     public QuestionSearchCondition() {
     }
 
-	public String getCoursePropertyName() {
-		return coursePropertyName;
-	}
+    public String getCoursePropertyName() {
+        return coursePropertyName;
+    }
 
-	public void setCoursePropertyName(String coursePropertyName) {
-		this.coursePropertyName = coursePropertyName;
-	}
+    public void setCoursePropertyName(String coursePropertyName) {
+        this.coursePropertyName = coursePropertyName;
+    }
 
-	public String getFirstPropertyId() {
-		return firstPropertyId;
-	}
+    public String getFirstPropertyId() {
+        return firstPropertyId;
+    }
 
-	public void setFirstPropertyId(String firstPropertyId) {
-		this.firstPropertyId = firstPropertyId;
-	}
+    public void setFirstPropertyId(String firstPropertyId) {
+        this.firstPropertyId = firstPropertyId;
+    }
 
-	public String getSecondPropertyId() {
-		return secondPropertyId;
-	}
+    public String getSecondPropertyId() {
+        return secondPropertyId;
+    }
 
-	public void setSecondPropertyId(String secondPropertyId) {
-		this.secondPropertyId = secondPropertyId;
-	}
+    public void setSecondPropertyId(String secondPropertyId) {
+        this.secondPropertyId = secondPropertyId;
+    }
 
-	public String getDifficulty() {
-		return difficulty;
-	}
+    public String getDifficulty() {
+        return difficulty;
+    }
 
-	public void setDifficulty(String difficulty) {
-		this.difficulty = difficulty;
-	}
+    public void setDifficulty(String difficulty) {
+        this.difficulty = difficulty;
+    }
 
-	public Boolean getPublicity() {
-		return publicity;
-	}
+    public Boolean getPublicity() {
+        return publicity;
+    }
 
-	public void setPublicity(Boolean publicity) {
-		this.publicity = publicity;
-	}
+    public void setPublicity(Boolean publicity) {
+        this.publicity = publicity;
+    }
 
-	public String getQuesNames() {
-		return quesNames;
-	}
+    public String getQuesNames() {
+        return quesNames;
+    }
 
-	public void setQuesNames(String quesNames) {
-		this.quesNames = quesNames;
-	}
+    public void setQuesNames(String quesNames) {
+        this.quesNames = quesNames;
+    }
 
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuestionType.java

@@ -17,7 +17,7 @@ public class QuestionType implements Serializable {
     private String name;// 类型标题
 
     @SuppressWarnings("rawtypes")
-	private Map params;// 类型参数
+    private Map params;// 类型参数
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
@@ -44,12 +44,12 @@ public class QuestionType implements Serializable {
     }
 
     @SuppressWarnings("rawtypes")
-	public Map getParams() {
+    public Map getParams() {
         return params;
     }
 
     @SuppressWarnings("rawtypes")
-	public void setParams(Map params) {
+    public void setParams(Map params) {
         this.params = params;
     }
 

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/QuestionTypeNum.java

@@ -3,41 +3,43 @@ package cn.com.qmth.examcloud.core.questions.dao.entity;
 import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 
 /**
- * @author  	chenken
- * @date    	2017年7月13日 上午11:07:55
- * @company 	QMTH
+ * @author chenken
+ * @date 2017年7月13日 上午11:07:55
+ * @company QMTH
  * @description dsd.java
  */
+
 /**
  * 试题类型--试题数量
  */
-public class QuestionTypeNum{
-	
-	private QuesStructType questionType;
-	
-	private Integer quantity;
-
-	public QuestionTypeNum(){}
-	
-	public QuestionTypeNum(QuesStructType questionType, Integer quantity) {
-		this.questionType = questionType;
-		this.quantity = quantity;
-	}
-
-	public QuesStructType getQuestionType() {
-		return questionType;
-	}
-
-	public void setQuestionType(QuesStructType questionType) {
-		this.questionType = questionType;
-	}
-
-	public Integer getQuantity() {
-		return quantity;
-	}
-
-	public void setQuantity(Integer quantity) {
-		this.quantity = quantity;
-	}
+public class QuestionTypeNum {
+
+    private QuesStructType questionType;
+
+    private Integer quantity;
+
+    public QuestionTypeNum() {
+    }
+
+    public QuestionTypeNum(QuesStructType questionType, Integer quantity) {
+        this.questionType = questionType;
+        this.quantity = quantity;
+    }
+
+    public QuesStructType getQuestionType() {
+        return questionType;
+    }
+
+    public void setQuestionType(QuesStructType questionType) {
+        this.questionType = questionType;
+    }
+
+    public Integer getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(Integer quantity) {
+        this.quantity = quantity;
+    }
 }
 

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/Specialty.java

@@ -4,82 +4,82 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * @date       2017.10.25
- * @author     weiwenhai
- * @describle  题库 专业    同步基础信息的   
+ * @author weiwenhai
+ * @date 2017.10.25
+ * @describle 题库 专业    同步基础信息的
  */
-public class Specialty implements Serializable{
-
-	private static final long serialVersionUID = -7144603935406955299L;
-	
-	private Long id;
-	
-	private String code;
-	
-	private String name;
-	
-	private Long orgId;
-	
-	private Date createTime;
-	
-	private Date updateTime;
-	
-	private Boolean enable;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public Boolean getEnable() {
-		return enable;
-	}
-
-	public void setEnable(Boolean enable) {
-		this.enable = enable;
-	}
-	
+public class Specialty implements Serializable {
+
+    private static final long serialVersionUID = -7144603935406955299L;
+
+    private Long id;
+
+    private String code;
+
+    private String name;
+
+    private Long orgId;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Boolean enable;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/computerTestModel/Block.java

@@ -3,61 +3,61 @@ package cn.com.qmth.examcloud.core.questions.dao.entity.computerTestModel;
 import java.util.Map;
 
 /**
- * @author  	chenken
- * @date    	2017年7月25日 上午10:19:31
- * @company 	QMTH
+ * @author chenken
+ * @date 2017年7月25日 上午10:19:31
+ * @company QMTH
  * @description Block.java
  */
 public class Block {
-	/**
-	 * text:文字
-	 * image：图片
-	 * audio：音频
-	 * video：视频
-	 */
-	private String type;
-	/**
-	 *	资源相对路径
-	 */
-	private String value;
-	/**
-	 * 播放次数
-	 */
-	private Integer playTime;
-	
-	private Map<String,Object> param;
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	public Map<String, Object> getParam() {
-		return param;
-	}
-
-	public void setParam(Map<String, Object> param) {
-		this.param = param;
-	}
-
-	public Integer getPlayTime() {
-		return playTime;
-	}
-
-	public void setPlayTime(Integer playTime) {
-		this.playTime = playTime;
-	}
-	
+    /**
+     * text:文字
+     * image：图片
+     * audio：音频
+     * video：视频
+     */
+    private String type;
+    /**
+     * 资源相对路径
+     */
+    private String value;
+    /**
+     * 播放次数
+     */
+    private Integer playTime;
+
+    private Map<String, Object> param;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public Map<String, Object> getParam() {
+        return param;
+    }
+
+    public void setParam(Map<String, Object> param) {
+        this.param = param;
+    }
+
+    public Integer getPlayTime() {
+        return playTime;
+    }
+
+    public void setPlayTime(Integer playTime) {
+        this.playTime = playTime;
+    }
+
 }
 

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/computerTestModel/ComputerTestOption.java

@@ -1,40 +1,41 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity.computerTestModel;
+
 /**
- * @author  	chenken
- * @date    	2017年7月25日 上午10:22:56
- * @company 	QMTH
+ * @author chenken
+ * @date 2017年7月25日 上午10:22:56
+ * @company QMTH
  * @description 选项
  */
 public class ComputerTestOption {
-	private Integer number;
-	
-	private Boolean correct;
-	
-	private Sections body;
-
-	public Integer getNumber() {
-		return number;
-	}
-
-	public void setNumber(Integer number) {
-		this.number = number;
-	}
-
-	public Boolean getCorrect() {
-		return correct;
-	}
-
-	public void setCorrect(Boolean correct) {
-		this.correct = correct;
-	}
-
-	public Sections getBody() {
-		return body;
-	}
-
-	public void setBody(Sections body) {
-		this.body = body;
-	}
-	
+    private Integer number;
+
+    private Boolean correct;
+
+    private Sections body;
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    public Boolean getCorrect() {
+        return correct;
+    }
+
+    public void setCorrect(Boolean correct) {
+        this.correct = correct;
+    }
+
+    public Sections getBody() {
+        return body;
+    }
+
+    public void setBody(Sections body) {
+        this.body = body;
+    }
+
 }
 

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/computerTestModel/ComputerTestPaper.java

@@ -5,126 +5,137 @@ import java.util.List;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Paper;
 
 /**
- * @author  	chenken
- * @date    	2017年7月25日 上午9:39:11
- * @company 	QMTH
+ * @author chenken
+ * @date 2017年7月25日 上午9:39:11
+ * @company QMTH
  * @description ComputerTestPaper.java
  */
 public class ComputerTestPaper {
-	
-	/**
-	 * 试卷编号
-	 */
-	private String id;
-	/**
-	 * 试卷名称
-	 */
-	private String name;
-	/**
-	 * 课程code
-	 */
-	private String courseCode;
-	/**
-	 * 试卷类型   A、B卷
-	 */
-	private transient String  groupCode;
-	/**
-	 * 课程名称
-	 */
-	private String courseName;
-	/**
-	 * 总分
-	 */
-	private double totalScore;
-	/**
-	 * 1:含有音视频
-	 * 0:不含有音视频
-	 */
-	private Integer hasVideo;
-	/**
-	 * 大题数量
-	 */
-	private int detailCount;
-	/**
-	 * 大题集合
-	 */
-	private List<ComputerTestPaperDetail> details;
-	
-	public ComputerTestPaper(){
-		
-	}
-	
-	public ComputerTestPaper(Paper paper,String groupCode){
-		this.id = paper.getId();
-		this.name = paper.getName();
-		this.courseCode = paper.getCourse().getCode();
-		this.courseName = paper.getCourse().getName();
-		this.totalScore = paper.getTotalScore();
-		this.detailCount = paper.getPaperDetailCount();
-		this.hasVideo = 0;//初始值为0
-		this.groupCode = groupCode;
-	}
-	
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public double getTotalScore() {
-		return totalScore;
-	}
-	public void setTotalScore(double totalScore) {
-		this.totalScore = totalScore;
-	}
-	public Integer getHasVideo() {
-		return hasVideo;
-	}
-	public void setHasVideo(Integer hasVideo) {
-		this.hasVideo = hasVideo;
-	}
-	public int getDetailCount() {
-		return detailCount;
-	}
-	public void setDetailCount(int detailCount) {
-		this.detailCount = detailCount;
-	}
-	public List<ComputerTestPaperDetail> getDetails() {
-		return details;
-	}
-	public void setDetails(List<ComputerTestPaperDetail> details) {
-		this.details = details;
-	}
-
-	public String getCourseCode() {
-		return courseCode;
-	}
-
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
-
-	public String getCourseName() {
-		return courseName;
-	}
-
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
-
-	public String getGroupCode() {
-		return groupCode;
-	}
-
-	public void setGroupCode(String groupCode) {
-		this.groupCode = groupCode;
-	}
-	
+
+    /**
+     * 试卷编号
+     */
+    private String id;
+    /**
+     * 试卷名称
+     */
+    private String name;
+    /**
+     * 课程code
+     */
+    private String courseCode;
+    /**
+     * 试卷类型   A、B卷
+     */
+    private transient String groupCode;
+    /**
+     * 课程名称
+     */
+    private String courseName;
+    /**
+     * 总分
+     */
+    private double totalScore;
+    /**
+     * 1:含有音视频
+     * 0:不含有音视频
+     */
+    private Integer hasVideo;
+    /**
+     * 大题数量
+     */
+    private int detailCount;
+    /**
+     * 大题集合
+     */
+    private List<ComputerTestPaperDetail> details;
+
+    public ComputerTestPaper() {
+
+    }
+
+    public ComputerTestPaper(Paper paper, String groupCode) {
+        this.id = paper.getId();
+        this.name = paper.getName();
+        this.courseCode = paper.getCourse().getCode();
+        this.courseName = paper.getCourse().getName();
+        this.totalScore = paper.getTotalScore();
+        this.detailCount = paper.getPaperDetailCount();
+        this.hasVideo = 0;//初始值为0
+        this.groupCode = groupCode;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public double getTotalScore() {
+        return totalScore;
+    }
+
+    public void setTotalScore(double totalScore) {
+        this.totalScore = totalScore;
+    }
+
+    public Integer getHasVideo() {
+        return hasVideo;
+    }
+
+    public void setHasVideo(Integer hasVideo) {
+        this.hasVideo = hasVideo;
+    }
+
+    public int getDetailCount() {
+        return detailCount;
+    }
+
+    public void setDetailCount(int detailCount) {
+        this.detailCount = detailCount;
+    }
+
+    public List<ComputerTestPaperDetail> getDetails() {
+        return details;
+    }
+
+    public void setDetails(List<ComputerTestPaperDetail> details) {
+        this.details = details;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getGroupCode() {
+        return groupCode;
+    }
+
+    public void setGroupCode(String groupCode) {
+        this.groupCode = groupCode;
+    }
+
 }
 

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/computerTestModel/ComputerTestPaperDetail.java

@@ -5,71 +5,81 @@ import java.util.List;
 import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetail;
 
 /**
- * @author  	chenken
- * @date    	2017年7月25日 上午9:43:00
- * @company 	QMTH
+ * @author chenken
+ * @date 2017年7月25日 上午9:43:00
+ * @company QMTH
  * @description ComputerTestPaperDetail.java
  */
 public class ComputerTestPaperDetail {
-	/**
-	 * 大题号
-	 */
-	private Integer number;
-	/**
-	 * 大题名称
-	 */
-	private String name;
-	/**
-	 * 大题总分
-	 */
-	private Double totalScore;
-	/**
-	 * 小题数量
-	 */
-	private Integer questionCount;
-	/**
-	 * 小题集合
-	 */
-	private List<ComputerTestQuestion> questions;
-	
-	public ComputerTestPaperDetail(){}
-	
-	public ComputerTestPaperDetail(PaperDetail paperDetail){
-		this.number = paperDetail.getNumber();
-		this.name = paperDetail.getName();
-		this.totalScore = paperDetail.getScore();
-	}
-	
-	public Integer getNumber() {
-		return number;
-	}
-	public void setNumber(Integer number) {
-		this.number = number;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public Double getTotalScore() {
-		return totalScore;
-	}
-	public void setTotalScore(Double totalScore) {
-		this.totalScore = totalScore;
-	}
-	public Integer getQuestionCount() {
-		return questionCount;
-	}
-	public void setQuestionCount(Integer questionCount) {
-		this.questionCount = questionCount;
-	}
-	public List<ComputerTestQuestion> getQuestions() {
-		return questions;
-	}
-	public void setQuestions(List<ComputerTestQuestion> questions) {
-		this.questions = questions;
-	}
-	
+    /**
+     * 大题号
+     */
+    private Integer number;
+    /**
+     * 大题名称
+     */
+    private String name;
+    /**
+     * 大题总分
+     */
+    private Double totalScore;
+    /**
+     * 小题数量
+     */
+    private Integer questionCount;
+    /**
+     * 小题集合
+     */
+    private List<ComputerTestQuestion> questions;
+
+    public ComputerTestPaperDetail() {
+    }
+
+    public ComputerTestPaperDetail(PaperDetail paperDetail) {
+        this.number = paperDetail.getNumber();
+        this.name = paperDetail.getName();
+        this.totalScore = paperDetail.getScore();
+    }
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Double getTotalScore() {
+        return totalScore;
+    }
+
+    public void setTotalScore(Double totalScore) {
+        this.totalScore = totalScore;
+    }
+
+    public Integer getQuestionCount() {
+        return questionCount;
+    }
+
+    public void setQuestionCount(Integer questionCount) {
+        this.questionCount = questionCount;
+    }
+
+    public List<ComputerTestQuestion> getQuestions() {
+        return questions;
+    }
+
+    public void setQuestions(List<ComputerTestQuestion> questions) {
+        this.questions = questions;
+    }
+
 }
 

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/computerTestModel/ComputerTestQuestion.java

@@ -9,158 +9,159 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnit;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
 
 /**
- * @author  	chenken
- * @date    	2017年7月25日 上午9:51:37
- * @company 	QMTH
+ * @author chenken
+ * @date 2017年7月25日 上午9:51:37
+ * @company QMTH
  * @description ComputerTestQuestion.java
  */
 public class ComputerTestQuestion {
-	
-	private String id;
-	/**
-	 * 小题号或套题内子题序号
-	 */
-	private Integer number;
-	
-	private Double score;// 小题分数
-	/**
-	 * 1-单选，2-多选，3-判断，4-填空，5-问答，6-套题
-	 */
-	private Long structType;
-	/**
-	 * 是否客观题
-	 */
-	private Boolean objective;
-	/**
-	 * 子题
-	 */
-	private List<ComputerTestQuestion> subQuestions;
-	
-	/**
-	 * 题干
-	 */
-	private Sections body;
-	
-	/**
-	 * 选项
-	 */
-	private List<ComputerTestOption> options;
-	
-	private Map<String,Object> param;
-	
-	/**
-	 * 答案
-	 */
-	private Sections answer;
-	
-	public ComputerTestQuestion(){}
-	
-	public ComputerTestQuestion(PaperDetailUnit paperDetailUnit){
-		this.id = paperDetailUnit.getId();
-		this.number = paperDetailUnit.getNumber();
-		this.score = paperDetailUnit.getScore();
-		this.structType = paperDetailUnit.getQuestionType().getId();
-		if(paperDetailUnit.getQuestionType() == QuesStructType.SINGLE_ANSWER_QUESTION || 
-				paperDetailUnit.getQuestionType() == QuesStructType.MULTIPLE_ANSWER_QUESTION ||
-				paperDetailUnit.getQuestionType() == QuesStructType.BOOL_ANSWER_QUESTION){
-			this.objective = true;
-		}else{
-			this.objective = false;
-		}
-	}
-	
-	public ComputerTestQuestion(Question question){
-		this.id = question.getId();
-		this.score = question.getScore();
-		this.structType = question.getQuestionType().getId();
-		if(question.getQuestionType() == QuesStructType.SINGLE_ANSWER_QUESTION || 
-				question.getQuestionType() == QuesStructType.MULTIPLE_ANSWER_QUESTION || 
-				question.getQuestionType() == QuesStructType.BOOL_ANSWER_QUESTION){
-			this.objective = true;
-		}else {
-			this.objective = false;
-		}
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public Integer getNumber() {
-		return number;
-	}
-
-	public void setNumber(Integer number) {
-		this.number = number;
-	}
-
-	public Double getScore() {
-		return score;
-	}
-
-	public void setScore(Double score) {
-		this.score = score;
-	}
-
-	public Long getStructType() {
-		return structType;
-	}
-
-	public void setStructType(Long structType) {
-		this.structType = structType;
-	}
-
-	public Boolean getObjective() {
-		return objective;
-	}
-
-	public void setObjective(Boolean objective) {
-		this.objective = objective;
-	}
-
-	public List<ComputerTestQuestion> getSubQuestions() {
-		return subQuestions;
-	}
-
-	public void setSubQuestions(List<ComputerTestQuestion> subQuestions) {
-		this.subQuestions = subQuestions;
-	}
-
-	public Sections getBody() {
-		return body;
-	}
-
-	public void setBody(Sections body) {
-		this.body = body;
-	}
-
-	public List<ComputerTestOption> getOptions() {
-		return options;
-	}
-
-	public void setOptions(List<ComputerTestOption> options) {
-		this.options = options;
-	}
-
-	public Map<String, Object> getParam() {
-		return param;
-	}
-
-	public void setParam(Map<String, Object> param) {
-		this.param = param;
-	}
-
-	public Sections getAnswer() {
-		return answer;
-	}
-
-	public void setAnswer(Sections answer) {
-		this.answer = answer;
-	}
-	
+
+    private String id;
+    /**
+     * 小题号或套题内子题序号
+     */
+    private Integer number;
+
+    private Double score;// 小题分数
+    /**
+     * 1-单选，2-多选，3-判断，4-填空，5-问答，6-套题
+     */
+    private Long structType;
+    /**
+     * 是否客观题
+     */
+    private Boolean objective;
+    /**
+     * 子题
+     */
+    private List<ComputerTestQuestion> subQuestions;
+
+    /**
+     * 题干
+     */
+    private Sections body;
+
+    /**
+     * 选项
+     */
+    private List<ComputerTestOption> options;
+
+    private Map<String, Object> param;
+
+    /**
+     * 答案
+     */
+    private Sections answer;
+
+    public ComputerTestQuestion() {
+    }
+
+    public ComputerTestQuestion(PaperDetailUnit paperDetailUnit) {
+        this.id = paperDetailUnit.getId();
+        this.number = paperDetailUnit.getNumber();
+        this.score = paperDetailUnit.getScore();
+        this.structType = paperDetailUnit.getQuestionType().getId();
+        if (paperDetailUnit.getQuestionType() == QuesStructType.SINGLE_ANSWER_QUESTION ||
+                paperDetailUnit.getQuestionType() == QuesStructType.MULTIPLE_ANSWER_QUESTION ||
+                paperDetailUnit.getQuestionType() == QuesStructType.BOOL_ANSWER_QUESTION) {
+            this.objective = true;
+        } else {
+            this.objective = false;
+        }
+    }
+
+    public ComputerTestQuestion(Question question) {
+        this.id = question.getId();
+        this.score = question.getScore();
+        this.structType = question.getQuestionType().getId();
+        if (question.getQuestionType() == QuesStructType.SINGLE_ANSWER_QUESTION ||
+                question.getQuestionType() == QuesStructType.MULTIPLE_ANSWER_QUESTION ||
+                question.getQuestionType() == QuesStructType.BOOL_ANSWER_QUESTION) {
+            this.objective = true;
+        } else {
+            this.objective = false;
+        }
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+
+    public Long getStructType() {
+        return structType;
+    }
+
+    public void setStructType(Long structType) {
+        this.structType = structType;
+    }
+
+    public Boolean getObjective() {
+        return objective;
+    }
+
+    public void setObjective(Boolean objective) {
+        this.objective = objective;
+    }
+
+    public List<ComputerTestQuestion> getSubQuestions() {
+        return subQuestions;
+    }
+
+    public void setSubQuestions(List<ComputerTestQuestion> subQuestions) {
+        this.subQuestions = subQuestions;
+    }
+
+    public Sections getBody() {
+        return body;
+    }
+
+    public void setBody(Sections body) {
+        this.body = body;
+    }
+
+    public List<ComputerTestOption> getOptions() {
+        return options;
+    }
+
+    public void setOptions(List<ComputerTestOption> options) {
+        this.options = options;
+    }
+
+    public Map<String, Object> getParam() {
+        return param;
+    }
+
+    public void setParam(Map<String, Object> param) {
+        this.param = param;
+    }
+
+    public Sections getAnswer() {
+        return answer;
+    }
+
+    public void setAnswer(Sections answer) {
+        this.answer = answer;
+    }
+
 }
 

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/computerTestModel/Section.java

@@ -3,23 +3,23 @@ package cn.com.qmth.examcloud.core.questions.dao.entity.computerTestModel;
 import java.util.List;
 
 /**
- * @author  	chenken
- * @date    	2017年7月25日 上午10:19:03
- * @company 	QMTH
+ * @author chenken
+ * @date 2017年7月25日 上午10:19:03
+ * @company QMTH
  * @description Section.java
  */
 public class Section {
-	
-	private List<Block> blocks;
-
-	public List<Block> getBlocks() {
-		return blocks;
-	}
-
-	public void setBlocks(List<Block> blocks) {
-		this.blocks = blocks;
-	}
-	
-	
+
+    private List<Block> blocks;
+
+    public List<Block> getBlocks() {
+        return blocks;
+    }
+
+    public void setBlocks(List<Block> blocks) {
+        this.blocks = blocks;
+    }
+
+
 }
 

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/computerTestModel/Sections.java

@@ -3,23 +3,23 @@ package cn.com.qmth.examcloud.core.questions.dao.entity.computerTestModel;
 import java.util.List;
 
 /**
- * @author  	chenken
- * @date    	2017年7月25日 上午10:13:10
- * @company 	QMTH
+ * @author chenken
+ * @date 2017年7月25日 上午10:13:10
+ * @company QMTH
  * @description Sections.java
  */
 public class Sections {
-	
-	private List<Section> sections;
-
-	public List<Section> getSections() {
-		return sections;
-	}
-
-	public void setSections(List<Section> sections) {
-		this.sections = sections;
-	}
-	
-	
+
+    private List<Section> sections;
+
+    public List<Section> getSections() {
+        return sections;
+    }
+
+    public void setSections(List<Section> sections) {
+        this.sections = sections;
+    }
+
+
 }
 

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/dto/CoursePropertyDto.java

@@ -1,70 +1,70 @@
 package cn.com.qmth.examcloud.core.questions.dao.entity.dto;
 
 /**
- * @describle 课程属性Dto
  * @author weiwenhai
- * @date   2017.11.2
+ * @describle 课程属性Dto
+ * @date 2017.11.2
  */
 public class CoursePropertyDto {
 
-	private Long id;
-	
-	private String name;
-	
-	private Long courseId;
-	
-	private Long orgId;
-	
-	private String enable;
-	
-	private String courseCode;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Long getCourseId() {
-		return courseId;
-	}
-
-	public void setCourseId(Long courseId) {
-		this.courseId = courseId;
-	}
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-	public String getEnable() {
-		return enable;
-	}
-
-	public void setEnable(String enable) {
-		this.enable = enable;
-	}
-
-	public String getCourseCode() {
-		return courseCode;
-	}
-
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
-	
+    private Long id;
+
+    private String name;
+
+    private Long courseId;
+
+    private Long orgId;
+
+    private String enable;
+
+    private String courseCode;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
+    public String getEnable() {
+        return enable;
+    }
+
+    public void setEnable(String enable) {
+        this.enable = enable;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/dto/CoursePropertyNumberDto.java

@@ -2,124 +2,124 @@ package cn.com.qmth.examcloud.core.questions.dao.entity.dto;
 
 public class CoursePropertyNumberDto {
 
-	private Long id; 
-	
-	private Long propertyId;
-	
-	private Long propertyParentId;
-	
-	private String propertyName;
-	
-	private Integer number;
-	
-	private Integer publicSimple; //公开简单
-	
-	private Integer publicMedium; //公开中等
-	
-	private Integer publicDifficulty; //公开困难
-	
-	private Integer noPublicSimple; //非公开简单
-	
-	private Integer noPublicMedium; //非公开中等
-	
-	private Integer noPublicDifficulty; //非公开困难
-	
-	private Boolean disable; //是否显示
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getPropertyId() {
-		return propertyId;
-	}
-
-	public void setPropertyId(Long propertyId) {
-		this.propertyId = propertyId;
-	}
-
-	public Long getPropertyParentId() {
-		return propertyParentId;
-	}
-
-	public void setPropertyParentId(Long propertyParentId) {
-		this.propertyParentId = propertyParentId;
-	}
-
-	public String getPropertyName() {
-		return propertyName;
-	}
-
-	public void setPropertyName(String propertyName) {
-		this.propertyName = propertyName;
-	}
-
-	public Integer getNumber() {
-		return number;
-	}
-
-	public void setNumber(Integer number) {
-		this.number = number;
-	}
-
-	public Integer getPublicSimple() {
-		return publicSimple;
-	}
-
-	public void setPublicSimple(Integer publicSimple) {
-		this.publicSimple = publicSimple;
-	}
-
-	public Integer getPublicMedium() {
-		return publicMedium;
-	}
-
-	public void setPublicMedium(Integer publicMedium) {
-		this.publicMedium = publicMedium;
-	}
-
-	public Integer getPublicDifficulty() {
-		return publicDifficulty;
-	}
-
-	public void setPublicDifficulty(Integer publicDifficulty) {
-		this.publicDifficulty = publicDifficulty;
-	}
-
-	public Integer getNoPublicSimple() {
-		return noPublicSimple;
-	}
-
-	public void setNoPublicSimple(Integer noPublicSimple) {
-		this.noPublicSimple = noPublicSimple;
-	}
-
-	public Integer getNoPublicMedium() {
-		return noPublicMedium;
-	}
-
-	public void setNoPublicMedium(Integer noPublicMedium) {
-		this.noPublicMedium = noPublicMedium;
-	}
-
-	public Integer getNoPublicDifficulty() {
-		return noPublicDifficulty;
-	}
-
-	public void setNoPublicDifficulty(Integer noPublicDifficulty) {
-		this.noPublicDifficulty = noPublicDifficulty;
-	}
-
-	public Boolean getDisable() {
-		return disable;
-	}
-
-	public void setDisable(Boolean disable) {
-		this.disable = disable;
-	}
-	
+    private Long id;
+
+    private Long propertyId;
+
+    private Long propertyParentId;
+
+    private String propertyName;
+
+    private Integer number;
+
+    private Integer publicSimple; //公开简单
+
+    private Integer publicMedium; //公开中等
+
+    private Integer publicDifficulty; //公开困难
+
+    private Integer noPublicSimple; //非公开简单
+
+    private Integer noPublicMedium; //非公开中等
+
+    private Integer noPublicDifficulty; //非公开困难
+
+    private Boolean disable; //是否显示
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getPropertyId() {
+        return propertyId;
+    }
+
+    public void setPropertyId(Long propertyId) {
+        this.propertyId = propertyId;
+    }
+
+    public Long getPropertyParentId() {
+        return propertyParentId;
+    }
+
+    public void setPropertyParentId(Long propertyParentId) {
+        this.propertyParentId = propertyParentId;
+    }
+
+    public String getPropertyName() {
+        return propertyName;
+    }
+
+    public void setPropertyName(String propertyName) {
+        this.propertyName = propertyName;
+    }
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    public Integer getPublicSimple() {
+        return publicSimple;
+    }
+
+    public void setPublicSimple(Integer publicSimple) {
+        this.publicSimple = publicSimple;
+    }
+
+    public Integer getPublicMedium() {
+        return publicMedium;
+    }
+
+    public void setPublicMedium(Integer publicMedium) {
+        this.publicMedium = publicMedium;
+    }
+
+    public Integer getPublicDifficulty() {
+        return publicDifficulty;
+    }
+
+    public void setPublicDifficulty(Integer publicDifficulty) {
+        this.publicDifficulty = publicDifficulty;
+    }
+
+    public Integer getNoPublicSimple() {
+        return noPublicSimple;
+    }
+
+    public void setNoPublicSimple(Integer noPublicSimple) {
+        this.noPublicSimple = noPublicSimple;
+    }
+
+    public Integer getNoPublicMedium() {
+        return noPublicMedium;
+    }
+
+    public void setNoPublicMedium(Integer noPublicMedium) {
+        this.noPublicMedium = noPublicMedium;
+    }
+
+    public Integer getNoPublicDifficulty() {
+        return noPublicDifficulty;
+    }
+
+    public void setNoPublicDifficulty(Integer noPublicDifficulty) {
+        this.noPublicDifficulty = noPublicDifficulty;
+    }
+
+    public Boolean getDisable() {
+        return disable;
+    }
+
+    public void setDisable(Boolean disable) {
+        this.disable = disable;
+    }
+
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/dto/PaperDetailUnitStructDto.java

@@ -23,17 +23,17 @@ public class PaperDetailUnitStructDto implements Serializable {
     private QuesStructType questionType;//小题类型
 
     private List<String> quesNames;//来源大题
-    
+
     private Integer publicSimple;//公开简单数量
-    
+
     private Integer publicMedium;//公开中等数量
-    
+
     private Integer publicDifficulty;//公开困难数量
-    
+
     private Integer noPublicSimple;//非公开简单数量
-    
+
     private Integer noPublicMedium;//非公开中等数量
-    
+
     private Integer noPublicDifficulty;//非公开困难数量
 
     public static long getSerialVersionUID() {
@@ -88,52 +88,52 @@ public class PaperDetailUnitStructDto implements Serializable {
         this.quesNames = quesNames;
     }
 
-	public Integer getPublicSimple() {
-		return publicSimple;
-	}
+    public Integer getPublicSimple() {
+        return publicSimple;
+    }
 
-	public void setPublicSimple(Integer publicSimple) {
-		this.publicSimple = publicSimple;
-	}
+    public void setPublicSimple(Integer publicSimple) {
+        this.publicSimple = publicSimple;
+    }
 
-	public Integer getPublicMedium() {
-		return publicMedium;
-	}
+    public Integer getPublicMedium() {
+        return publicMedium;
+    }
 
-	public void setPublicMedium(Integer publicMedium) {
-		this.publicMedium = publicMedium;
-	}
+    public void setPublicMedium(Integer publicMedium) {
+        this.publicMedium = publicMedium;
+    }
 
-	public Integer getPublicDifficulty() {
-		return publicDifficulty;
-	}
+    public Integer getPublicDifficulty() {
+        return publicDifficulty;
+    }
 
-	public void setPublicDifficulty(Integer publicDifficulty) {
-		this.publicDifficulty = publicDifficulty;
-	}
+    public void setPublicDifficulty(Integer publicDifficulty) {
+        this.publicDifficulty = publicDifficulty;
+    }
 
-	public Integer getNoPublicSimple() {
-		return noPublicSimple;
-	}
+    public Integer getNoPublicSimple() {
+        return noPublicSimple;
+    }
 
-	public void setNoPublicSimple(Integer noPublicSimple) {
-		this.noPublicSimple = noPublicSimple;
-	}
+    public void setNoPublicSimple(Integer noPublicSimple) {
+        this.noPublicSimple = noPublicSimple;
+    }
 
-	public Integer getNoPublicMedium() {
-		return noPublicMedium;
-	}
+    public Integer getNoPublicMedium() {
+        return noPublicMedium;
+    }
 
-	public void setNoPublicMedium(Integer noPublicMedium) {
-		this.noPublicMedium = noPublicMedium;
-	}
+    public void setNoPublicMedium(Integer noPublicMedium) {
+        this.noPublicMedium = noPublicMedium;
+    }
+
+    public Integer getNoPublicDifficulty() {
+        return noPublicDifficulty;
+    }
 
-	public Integer getNoPublicDifficulty() {
-		return noPublicDifficulty;
-	}
+    public void setNoPublicDifficulty(Integer noPublicDifficulty) {
+        this.noPublicDifficulty = noPublicDifficulty;
+    }
 
-	public void setNoPublicDifficulty(Integer noPublicDifficulty) {
-		this.noPublicDifficulty = noPublicDifficulty;
-	}
-    
 }

examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/entity/dto/PropertyDto.java

@@ -5,91 +5,92 @@ import java.util.List;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Property;
 
 /**
- * @describle 属性Dto
  * @author weiwenhai
- * @date   2017.11.6
+ * @describle 属性Dto
+ * @date 2017.11.6
  */
 public class PropertyDto {
 
-	private Long id;
-	
-	private Long coursePropertyId;
-	
-	private String name;
-	
-	private Integer number;
-	
-	private Long parentId;
-	
-	private String remark;
-	
-	private List<PropertyDto> propertyDtos;
-	
-	public PropertyDto(){}
-	
-	public PropertyDto(Property property){
-		this.id = property.getId();
-		this.coursePropertyId = property.getCoursePropertyId();
-		this.name = property.getName();
-		this.number = property.getNumber();
-		this.remark = property.getRemark();
-		this.parentId = property.getParentId();
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getCoursePropertyId() {
-		return coursePropertyId;
-	}
-
-	public void setCoursePropertyId(Long coursePropertyId) {
-		this.coursePropertyId = coursePropertyId;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Integer getNumber() {
-		return number;
-	}
-
-	public void setNumber(Integer number) {
-		this.number = number;
-	}
-
-	public Long getParentId() {
-		return parentId;
-	}
-
-	public void setParentId(Long parentId) {
-		this.parentId = parentId;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public List<PropertyDto> getPropertyDtos() {
-		return propertyDtos;
-	}
-
-	public void setPropertyDtos(List<PropertyDto> propertyDtos) {
-		this.propertyDtos = propertyDtos;
-	}
+    private Long id;
+
+    private Long coursePropertyId;
+
+    private String name;
+
+    private Integer number;
+
+    private Long parentId;
+
+    private String remark;
+
+    private List<PropertyDto> propertyDtos;
+
+    public PropertyDto() {
+    }
+
+    public PropertyDto(Property property) {
+        this.id = property.getId();
+        this.coursePropertyId = property.getCoursePropertyId();
+        this.name = property.getName();
+        this.number = property.getNumber();
+        this.remark = property.getRemark();
+        this.parentId = property.getParentId();
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getCoursePropertyId() {
+        return coursePropertyId;
+    }
+
+    public void setCoursePropertyId(Long coursePropertyId) {
+        this.coursePropertyId = coursePropertyId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public List<PropertyDto> getPropertyDtos() {
+        return propertyDtos;
+    }
+
+    public void setPropertyDtos(List<PropertyDto> propertyDtos) {
+        this.propertyDtos = propertyDtos;
+    }
 
 }