Merge branch 'dev' into release

1

themis-business/src/main/java/com/qmth/themis/business/templete/TaskExportCommon.java

@@ -161,7 +161,7 @@ public class TaskExportCommon {
                 json.put("path", file.getPath());
             }
             json.put("type", this.type);
-            json.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.file.name());
+            json.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.file.ordinal());
             this.tbTaskHistory.setReportFilePath(json.toJSONString());
             if (Objects.nonNull(excelFile)) {
                 JSONObject excelJson = new JSONObject();
@@ -171,7 +171,7 @@ public class TaskExportCommon {
                     excelJson.put("path", excelFile.getPath());
                 }
                 excelJson.put("type", this.type);
-                excelJson.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.file.name());
+                excelJson.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.file.ordinal());
                 this.tbTaskHistory.setResultFilePath(excelJson.toJSONString());
             }
             if (Objects.equals(this.type, SystemConstant.OSS)) {