xiatian пре 4 година
родитељ
комит
8627db95fb

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

@@ -90,18 +90,19 @@ public class TaskExamStudentExportTemplete implements TaskExportTemplete {
             taskExportCommon.setException(true);
             taskExportCommon.getTbTaskHistory().setSummary("处理出错");
         } finally {
-        	if (Objects.nonNull(fos)) {
+        	
+            taskExportCommon.getTbTaskHistory().setFinishTime(System.currentTimeMillis());
+            taskExportCommon.getTbTaskHistory().setStatus(TaskStatusEnum.FINISH);
+            taskExportCommon.getTbTaskHistory().setProgress(100.0d);
+            //这里写入txt文件
+            taskExportCommon.writeExportResultTxt(stringJoiner.toString(), "", excelFilePath);
+            if (Objects.nonNull(fos)) {
         		fos.flush();
         		fos.close();
         	}
         	if (Objects.nonNull(inputStream)) {
                 inputStream.close();
             }
-            taskExportCommon.getTbTaskHistory().setFinishTime(System.currentTimeMillis());
-            taskExportCommon.getTbTaskHistory().setStatus(TaskStatusEnum.FINISH);
-            taskExportCommon.getTbTaskHistory().setProgress(100.0d);
-            //这里写入txt文件
-            taskExportCommon.writeExportResultTxt(stringJoiner.toString(), "", excelFilePath);
         }
         return ResultUtil.ok(Collections.singletonMap(SystemConstant.SUCCESS, true));
     }