错误日志导出

gic-store-service/src/main/java/com/gic/store/service/outer/StoreImportApiServiceImpl.java

@@ -146,6 +146,30 @@ public class StoreImportApiServiceImpl implements StoreImportApiService {
         // 数据
         // 普通数据
         // 自定义数据
+        packData(resultList, dataList);
+        return ServiceResponse.success(resultList);
+    }
+
+    private List<String> getTitle(Integer enterpriseId, Integer regionId) {
+        List<String> titleList = storeApiService.listImportTitle(enterpriseId, regionId).getResult().get(0);
+        titleList.add("错误信息");
+        return titleList;
+    }
+
+    @Override
+    public ServiceResponse<Page> pageError(Integer enterpriseId, Integer currentPage, Integer pageSize) {
+        List<List<String>> resultList = new LinkedList<>();
+        Page page = this.listStoreTmp(enterpriseId, Boolean.FALSE, currentPage, pageSize).getResult();
+        List<StoreTmpDTO> dataList = page.getResult();
+
+        List<String> title = getTitle(enterpriseId, dataList.get(0).getRegionId());
+        resultList.add(title);
+        packData(resultList, dataList);
+        page.setResult(resultList);
+        return ServiceResponse.success(page);
+    }
+
+    private void packData(List<List<String>> resultList, List<StoreTmpDTO> dataList) {
         for (int i = 0; i < dataList.size(); i++) {
             List<String> list = new LinkedList<>();
             StoreTmpDTO storeTmpDTO = dataList.get(i);
@@ -174,23 +198,6 @@ public class StoreImportApiServiceImpl implements StoreImportApiService {
 
             resultList.add(list);
         }
-        return ServiceResponse.success(resultList);
-    }
-
-    private List<String> getTitle(Integer enterpriseId, Integer regionId) {
-        List<String> titleList = storeApiService.listImportTitle(enterpriseId, regionId).getResult().get(0);
-        titleList.add("错误信息");
-        return titleList;
-    }
-
-    @Override
-    public ServiceResponse<Page> pageError(Integer enterpriseId, Integer currentPage, Integer pageSize) {
-        List<List<String>> resultList = new LinkedList<>();
-        Page page = this.listStoreTmp(enterpriseId, Boolean.FALSE, currentPage, pageSize).getResult();
-        List<StoreTmpDTO> result = page.getResult();
-
-
-        return null;
     }