Commit a48e6d48 authored by 韩桐桐's avatar 韩桐桐

导出BUGFIX

parent c566ae74
......@@ -113,7 +113,7 @@ public class JgTableDataExportServiceImpl implements IJgTableDataExportService {
private final String DOWN_LOAD_START_TEMP = "{\"id\":\"%s\",\"status\":\"starting\",\"fileName\":\"%s\",\"time\":\"%s\"}";
private final String BUCKET_NAME = "upload";
private final String UPLOAD_PATH = "/tzs/excelTempFile";
private final int PAGE_SIZE = 100;
private final int PAGE_SIZE = 1000;
private final String DOWNLOAD_TOPIC = "/topic/download/excel/%s";
private final ExecutorService executorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
......
......@@ -51,7 +51,7 @@ public class DictUtil {
String typeHandler = annotation.typeHandler();
String name = "";
if ("null".equals(code)) {
return;
continue;
}
Object handler = SpringUtil.getBean(typeHandler);
......@@ -71,11 +71,11 @@ public class DictUtil {
} else if (field.isAnnotationPresent(JsonFormat.class)) {
try {
Object value = field.get(data);
if (value == null) return;
if (value == null) continue;
JsonFormat jsonFormat = field.getAnnotation(JsonFormat.class);
String pattern = jsonFormat.pattern();
if (pattern == null || pattern.isEmpty()) return;
if (pattern == null || pattern.isEmpty()) continue;
String formatted = null;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment