Merge branch 'dev' into release

1

themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamStudentController.java

@@ -11,7 +11,6 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -119,8 +118,7 @@ public class TEExamStudentController {
                        @ApiParam(value = "年级", required = false) @RequestParam(required = false) String grade,
                        @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable,
                        @ApiParam(value = "教学班级", required = false) @RequestParam(required = false) String classNo,
-                       @ApiParam(value = "底照是否上传", required = false) @RequestParam(required = false) Integer hasPhoto,
-                       HttpServletResponse response) throws Exception {
+                       @ApiParam(value = "底照是否上传", required = false) @RequestParam(required = false) Integer hasPhoto) throws Exception {
     	TBTaskHistory tbTaskHistory = null;
         Map<String, Object> transMap = new HashMap<String, Object>();
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();

themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskExamStudentExportTemplete.java

@@ -53,7 +53,7 @@ public class TaskExamStudentExportTemplete implements TaskExportTemplete {
      */
     @Override
     public Result exportTask(Map<String, Object> transMap) throws IOException {
-        log.info("开始导出考场数据");
+        log.info("开始导出考生数据");
         long start = System.currentTimeMillis();
         TaskExportCommon taskExportCommon = new TaskExportCommon(transMap);
         taskExportCommon.init();
@@ -95,7 +95,7 @@ public class TaskExamStudentExportTemplete implements TaskExportTemplete {
             taskExportCommon.ossUpload(file);
             taskExportCommon.getTbTaskHistory().setSummary("处理成功");
             long end = System.currentTimeMillis();
-            log.info("导出考场数据结束,============耗时============:{}秒", (end - start) / 1000);
+            log.info("导出考生数据结束,============耗时============:{}秒", (end - start) / 1000);
         } catch (Exception e) {
             log.error("导出报错", e);
             taskExportCommon.setException(true);

themis-business/src/main/resources/mapper/TEExamActivityMapper.xml

@@ -120,9 +120,9 @@
             tees.course_name as courseName,
             IFNULL(teea.opening_seconds,tee.opening_seconds) as openingSeconds,
             teea.opening_seconds as activityOpeningSeconds,
-            date_sub(teea.start_time, interval IFNULL(teea.prepare_seconds, tee.prepare_seconds) second) as prepareTime,
+            (teea.start_time / 1000 - IFNULL(teea.prepare_seconds, tee.prepare_seconds)) * 1000 as prepareTime,
             IFNULL(teea.start_time, tee.start_time) as minStartTime,
-            date_add(teea.start_time, interval IFNULL(teea.opening_seconds, tee.opening_seconds) second) as maxStartTime,
+            (teea.start_time / 1000 + IFNULL(teea.opening_seconds, tee.opening_seconds)) as maxStartTime,
             IF(tee.mode = 'TOGETHER' and tee.force_finish = 1, IFNULL(teea.finish_time , tee.end_time), null) as maxFinishTime,
             tee.monitor_video_source as monitorVideoSourceStr,
             IFNULL(teea.prepare_seconds,tee.prepare_seconds) as prepareSeconds,