diff --git a/zc-business/src/main/java/com/zc/business/controller/WordController.java b/zc-business/src/main/java/com/zc/business/controller/WordController.java index 0786173d..9414fdac 100644 --- a/zc-business/src/main/java/com/zc/business/controller/WordController.java +++ b/zc-business/src/main/java/com/zc/business/controller/WordController.java @@ -690,7 +690,7 @@ public class WordController { PoiUtil.createHeading2(doc, "当天全路段实时车流量-济南方向"); - XWPFTable table = doc.createTable(15,3); + XWPFTable table = doc.createTable(17,3); //列宽自动分割 CTTblWidth infoTableWidth = table.getCTTbl().addNewTblPr().addNewTblW(); infoTableWidth.setType(STTblWidth.DXA); diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcTrafficSurveyDataServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcTrafficSurveyDataServiceImpl.java index 04f5d768..21f95942 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcTrafficSurveyDataServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcTrafficSurveyDataServiceImpl.java @@ -650,10 +650,14 @@ public class DcTrafficSurveyDataServiceImpl implements IDcTrafficSurveyDataServi ) )); if (dataList != null && dataList.size() > 0){ - JSONArray hezeLanesData = dataList.get("1"); - formatTrafficSurveyData(hezeData,hezeLanesData); - JSONArray jinanLanesData = dataList.get("3"); - formatTrafficSurveyData(jinanData,jinanLanesData); + if(dataList.containsKey("1")){ + JSONArray hezeLanesData = dataList.get("1"); + formatTrafficSurveyData(hezeData,hezeLanesData); + } + if (dataList.containsKey("3")){ + JSONArray jinanLanesData = dataList.get("3"); + formatTrafficSurveyData(jinanData,jinanLanesData); + } } Map dataItem = new HashMap<>();