diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java index a226151..544b4ef 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java @@ -557,43 +557,11 @@ public class RiskReportFacade { } map.put("data",items); series.add(map); - - - -// List> bfbItem = new ArrayList<>(); -// -// if (CollectionUtils.isNotEmpty(series)) -// { -// int index = 0; -// for (Map seriseMap : series) -// { -// Map percent = new HashMap<>(); -// percent.put("name",seriseMap.get("name")); -// percent.put("type","line"); -// -// -// //占比/环比百分比 -// List bfb = new ArrayList<>(); -// -// -// index++; -// List colums = (List)seriseMap.get("data"); -// Object obj = colums.get(index); -// int total = 0; -// -// for (Map sMap : series) -// { -// List colums1 = (List)sMap.get("data"); -// Object obj1 = colums1.get(index); -// -// total += Integer.valueOf(String.valueOf(obj1)); -// } -// bfb.add(MathUtil.getProportion(Integer.valueOf(String.valueOf(obj)),total); -// } -// } - - } + + //计算占比 + List> bfbItem = handzb(series); + series.addAll(bfbItem); } } else if (addrType == 3) @@ -639,6 +607,10 @@ public class RiskReportFacade { } series.add(map); } + + //计算占比 + List> bfbItem = handzb(series); + series.addAll(bfbItem); } } datas.put("series",series); @@ -650,6 +622,47 @@ public class RiskReportFacade { } /** + * 占比计算 + * @param series + * @return + */ + private List> handzb(List> series) + { + List> bfbItem = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(series)) + { + for (Map seriseMap : series) + { + List bfb = new ArrayList<>(); + Map bfbMap = new HashMap<>(); + bfbMap.put("name",seriseMap.get("name")); + bfbMap.put("type","line"); + + List colums = (List)seriseMap.get("data"); + + for (int i = 0 ;i < colums.size() ;i++) + { + Object obj = colums.get(i); + int total = 0; + for (int j = 0 ;j < colums.size() ;j++) + { + Object obj1 = colums.get(j); + + total += Integer.valueOf(String.valueOf(obj1)); + } + bfb.add(MathUtil.getProportion(Integer.valueOf(String.valueOf(obj)),total)); + bfbMap.put("data",bfb); + } + bfbItem.add(bfbMap); + } + } + + return bfbItem; + + } + + + /** * 表格标题 * @param addrType * @return