wangliang %!s(int64=4) %!d(string=hai) anos
pai
achega
67c01f2539

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

@@ -138,20 +138,20 @@ public class TaskExportCommon {
             fileWriter.write(txtStr);
             JSONObject json = new JSONObject();
             if (Objects.equals(this.type, SystemConstant.OSS)) {
-            	json.put("path", file.getPath().replaceAll("\\\\", "/"));
-            }else {
-            	json.put("path", file.getPath());
+                json.put("path", file.getPath().replaceAll("\\\\", "/"));
+            } else {
+                json.put("path", file.getPath());
             }
             json.put("type", this.type);
             this.tbTaskHistory.setReportFilePath(json.toJSONString());
             if (Objects.nonNull(excelFile)) {
                 JSONObject excelJson = new JSONObject();
                 if (Objects.equals(this.type, SystemConstant.OSS)) {
-                	excelJson.put("path", excelFile.getPath().replaceAll("\\\\", "/"));
-                }else {
-                	excelJson.put("path", excelFile.getPath());
+                    excelJson.put("path", excelFile.getPath().replaceAll("\\\\", "/"));
+                } else {
+                    excelJson.put("path", excelFile.getPath());
                 }
-                
+
                 excelJson.put("type", this.type);
                 this.tbTaskHistory.setResultFilePath(excelJson.toJSONString());
             }
@@ -181,10 +181,9 @@ public class TaskExportCommon {
      */
     public List<String> exception(int min, int y, Exception e, List<String> txtList) {
         this.exception = true;
-        String exceptionStr = "数据导出到第" + (y == 0 ? y + 1 : y) + "条时发生异常:" + e.getMessage();
+        String exceptionStr = "数据导出到第" + (y == 0 ? y + 1 : y) + "条时发生异常,请联系系统管理员处理!";
         txtList.add(DateUtil.format(new Date(), this.timeFormat) + "->" + exceptionStr);
         this.tbTaskHistory.setSummary(exceptionStr);
-//        this.tbTaskHistoryService.updateById(this.tbTaskHistory);
         return txtList;
     }
 

+ 1 - 2
themis-business/src/main/java/com/qmth/themis/business/templete/TaskImportCommon.java

@@ -154,10 +154,9 @@ public class TaskImportCommon {
      */
     public List<String> exception(int min, int y, Exception e, List<String> txtList) {
         this.exception = true;
-        String exceptionStr = "数据处理到第" + (y == 0 ? y + 1 : y) + "条时发生异常:" + e.getMessage();
+        String exceptionStr = "数据处理到第" + (y == 0 ? y + 1 : y) + "条时发生异常,请联系系统管理员处理!";
         txtList.add(DateUtil.format(new Date(), this.timeFormat) + "->" + exceptionStr);
         this.tbTaskHistory.setSummary(exceptionStr);
-//        this.tbTaskHistoryService.updateById(this.tbTaskHistory);
         return txtList;
     }