Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/cn/com/qmth/dp/examcloud/oe/Task.java
#	src/main/java/cn/com/qmth/dp/examcloud/oe/modules/get_student_answer_detail/GetStduentAnswerDetailService.java
#	src/main/resources/application.properties

src/main/java/cn/com/qmth/dp/examcloud/oe/Tianji2App.java

@@ -25,25 +25,25 @@ import org.springframework.scheduling.annotation.EnableAsync;
 @EnableAutoConfiguration(exclude = {RedisAutoConfiguration.class})
 public class Tianji2App {
 
-	static {
-		System.setProperty("hibernate.dialect.storage_engine", "innodb");
-		PropertiesUtil.loadFromResource("application.properties");
-		PropertyHolder.loadFromResource("application.properties");
-	}
+    static {
+        System.setProperty("hibernate.dialect.storage_engine", "innodb");
+        PropertiesUtil.loadFromResource("application.properties");
+        PropertyHolder.loadFromResource("application.properties");
+    }
 
-	/**
-	 * main
-	 *
-	 * @author WANGWEI
-	 * @param args
-	 */
-	public static void main(String[] args) {
-		SpringApplication.run(Tianji2App.class, args);
+    /**
+     * main
+     *
+     * @param args
+     * @author WANGWEI
+     */
+    public static void main(String[] args) {
+        SpringApplication.run(Tianji2App.class, args);
 
-//		UpyunSiteManager.init();
+        // UpyunSiteManager.init();
 
-		Task task = SpringContextHolder.getBean(Task.class);
-		task.start();
-	}
+        Task task = SpringContextHolder.getBean(Task.class);
+        task.start();
+    }
 
-}
+}

src/main/java/cn/com/qmth/dp/examcloud/oe/modules/export_exam_student_score/ExportExamStudentScore.java

@@ -26,6 +26,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+/**
+ * 导出 - 小题分
+ */
 @Component
 public class ExportExamStudentScore {
 

src/main/java/cn/com/qmth/dp/examcloud/oe/modules/get_student_answer_by_identity_number/GetStduentAnswerByIdentityNumberService.java

@@ -43,7 +43,7 @@ public class GetStduentAnswerByIdentityNumberService {
 
 	private int sqlIndex = 1;
 
-	@Async
+	// @Async
 	public void start(Long examId, String courseCode, String identityNumber) throws Exception {
 		String packageName = this.getClass().getPackage().getName();
 		String packagePath = packageName.replaceAll("\\.", "/");

src/main/java/cn/com/qmth/dp/examcloud/oe/modules/get_student_one_question_answer/GetStduentOneAnswerService.java

@@ -21,11 +21,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 获取考生作答明细
- *
- * @author WANGWEI
- * @date 2019年7月11日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ * 导出 - 考生作答结果（带手机号）
  */
 @Service
 public class GetStduentOneAnswerService {
@@ -78,9 +74,9 @@ public class GetStduentOneAnswerService {
                 String studentAnswer = doc.getString("studentAnswer");
 
                 if (null == order) {
-                    throw new RuntimeException(
-                            "order is null. examRecordDataId=" + examRecordDataId);
+                    throw new RuntimeException("order is null. examRecordDataId=" + examRecordDataId);
                 }
+
                 if (!order.equals(questionOrder)) {
                     continue;
                 }

src/main/java/cn/com/qmth/dp/examcloud/oe/modules/update_correct_answer/FixCorrectAnswerAndResetScoreService.java

@@ -41,7 +41,7 @@ public class FixCorrectAnswerAndResetScoreService {
     @Autowired
     MongoTemplate mongoTemplate;
 
-    @Async
+    // @Async
     public void start() {
         String absolutePath= PropertiesUtil.getString("fixAnswer.data.path");
 //        ClassPathResource classPathResource = new ClassPathResource("temp1.txt");

src/main/java/cn/com/qmth/dp/examcloud/oe/modules/update_correct_answer/ResetScoreService.java

@@ -32,7 +32,7 @@ public class ResetScoreService {
 
     private static final Long MARKING_TYPE_KEY = 24L;// 阅卷方式KEY
 
-    @Async
+    // @Async
     public void start() {
         String absolutePath = PropertiesUtil.getString("fixAnswer.data.path");
 //        ClassPathResource classPathResource = new ClassPathResource("temp1.txt");

src/test/java/cn/com/qmth/dp/examcloud/oe/test/ExportTest.java

@@ -18,19 +18,22 @@ public class ExportTest {
     private ExportExamStudentScore exportExamStudentScore;
 
     @Autowired
-    private GetStduentOneAnswerService getStduentOneAnswerService;
+    private GetStduentOneAnswerService studentOneAnswerService;
 
     @Autowired
-    private GetStduentAnswerDetailService getStduentAnswerDetailService;
+    private GetStduentAnswerDetailService studentAnswerDetailService;
 
     @Test
     public void exportTest() throws Exception {
+        // 导出 - 小题分
         // exportExamStudentScore.start();
 
-        // getStduentOneAnswerService.start(1213L, 1, "01");
-        // getStduentOneAnswerService.start(1213L, 1, "28");
+        // 导出 - 考生作答结果（带手机号）
+        // studentOneAnswerService.start(1213L, 1, "01");
+        // studentOneAnswerService.start(1213L, 1, "28");
 
-        // getStduentAnswerDetailService.start(19L, "03013750");
+        // 导出 - 考生得分明细
+        // studentAnswerDetailService.start(1606L, "410901031");
     }
 
 }