diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java index 91459f4a2..ddb48a175 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -34,6 +34,7 @@ import org.springframework.stereotype.Component; import java.io.File; import java.io.OutputStream; +import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; @@ -264,6 +265,7 @@ public class AsyncTask { List successList = datalist.getList(); //List failList = datalist.getFailList(); if(null != successList && successList.size() > 0 ) { + List tlist = new ArrayList(); try { successList.parallelStream().forEach(poiBase -> { try { @@ -282,16 +284,23 @@ public class AsyncTask { }else { poiBase.setGaodeRemark("未匹配到信息"); } + tlist.add(poiBase); } catch (UnknownSessionException ue) { logger.error("session :"+ue.getMessage()); } }); + if (tlist.size() <= 0 ) { + MerchantPoiTNew t = new MerchantPoiTNew(); + t.setPoiId("adafdasdf"); + t.setGaodeRemark("怎么没有啊"); + tlist.add(t); + } ExportParams exportParams = new ExportParams(); exportParams.setCreateHeadRows(true); exportParams.setExclusions(headers); - Workbook workBook = ExcelExportUtil.exportExcel(exportParams, MerchantPoiTNew.class, successList); + Workbook workBook = ExcelExportUtil.exportExcel(exportParams, MerchantPoiTNew.class, tlist); exportExcel(request, response, workBook, "POI匹配模版-高德.xls"); } catch (Exception e) { logger.error("更新地理信息失败:"+e.getMessage(),e);