Parcourir la source

Merge remote-tracking branch 'origin/dev' into dev

wangliang il y a 4 ans
Parent
commit
3f28bf6295

+ 5 - 0
themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskExamPaperImportTemplete.java

@@ -10,6 +10,7 @@ import com.qmth.themis.business.entity.TEExam;
 import com.qmth.themis.business.entity.TEExamCourse;
 import com.qmth.themis.business.entity.TEExamPaper;
 import com.qmth.themis.business.enums.EncryptModeEnum;
+import com.qmth.themis.business.enums.TaskStatusEnum;
 import com.qmth.themis.business.service.TEExamCourseService;
 import com.qmth.themis.business.service.TEExamPaperService;
 import com.qmth.themis.business.service.TEExamService;
@@ -68,10 +69,12 @@ public class TaskExamPaperImportTemplete implements TaskImportTemplete {
         try {
             file = taskImportCommon.getUploadFile();
             dispose(file, map, result);
+            taskImportCommon.getTbTaskHistory().setSummary("处理成功");
         } catch (Exception e) {
             taskImportCommon.setException(true);
             log.error("处理出错 ", e);
             addResult(result, "处理出错 " + e.getMessage());
+            taskImportCommon.getTbTaskHistory().setSummary("处理出错");
         } finally {
             if (file != null) {
                 file.delete();
@@ -79,6 +82,8 @@ public class TaskExamPaperImportTemplete implements TaskImportTemplete {
             addResult(result, DateUtil.format(new Date(), timeFormat) + "处理结束");
             long end = System.currentTimeMillis();
             addResult(result, "耗时(秒):" + ((end - start) / 1000));
+            taskImportCommon.getTbTaskHistory().setFinishTime(new Date());
+            taskImportCommon.getTbTaskHistory().setStatus(TaskStatusEnum.FINISH);
             taskImportCommon.writeImportResultTxt(result.toString(), file);
         }
         return ResultUtil.ok(Collections.singletonMap("success", true));