diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/dao/impl/BaseDaoImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/dao/impl/BaseDaoImpl.java index 42d2a70..f84c564 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/dao/impl/BaseDaoImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/dao/impl/BaseDaoImpl.java @@ -39,7 +39,7 @@ public class BaseDaoImpl implements IBaseDao { return qr.query(sql, new MapListHandler(), params.toArray()); } catch (SQLException e) { logger.error("查询出错: sql: {}, params: {}", sql, params); - throw new RuntimeException(); } + return null; } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 83aa75e..57c27e9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -52,8 +52,8 @@ public class ReportServiceImpl implements IReportService { } - private Map createGrid(List peopleList, List proportionList) { - Map map = new HashMap<>(); + private List> createGrid(List peopleList, List proportionList) { + List> restList = new ArrayList<>(); Map peoples = new HashMap<>(); peoples.put("desc", peopleList.get(0)); /** 产检人数 */ peoples.put("count", peopleList.get(1));/** 总计 */ @@ -69,8 +69,7 @@ public class ReportServiceImpl implements IReportService { peoples.put("tenTimes", peopleList.get(11)); peoples.put("elevenTimes", peopleList.get(12)); peoples.put("twelveTimes", peopleList.get(13)); -// map.put("peoples", peopleList); - map.put("peoples", peoples); + restList.add(peoples); Map proportion = new HashMap<>(); proportion.put("desc", proportionList.get(0)); /** 占比 */ @@ -87,9 +86,8 @@ public class ReportServiceImpl implements IReportService { proportion.put("tenTimes", proportionList.get(11)); proportion.put("elevenTimes", proportionList.get(12)); proportion.put("twelveTimes", proportionList.get(13)); -// map.put("proportion", proportionList); - map.put("proportion", proportion); - return map; + restList.add(proportion); + return restList; } private List createProportion(List peopleList) { @@ -137,6 +135,7 @@ public class ReportServiceImpl implements IReportService { List newList = new ArrayList<>(); newList.addAll(list); newList.remove(0); + newList.remove(0); return newList; } @@ -238,11 +237,4 @@ public class ReportServiceImpl implements IReportService { return sql.toString(); } - public static void main(String[] args) { - System.out.println("1".equals("" + 1)); - System.out.println(StringUtils.isNotBlank("")); - - - - } }