Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-15 8efcc21de04bd7f7d784dac97e86e76e1a3ab930

 src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java

@@ -209,8 +209,11 @@
                  Map<String, BigDecimal> mapData = (Map<String, BigDecimal>) obj;

                  BigDecimal sum = mapData.remove("sum");

                  for (Entry<String, BigDecimal> entry : mapData.entrySet()) {

                     if (!"name".equals(entry.getKey())) {

                     sortMap.put(entry.getKey() + "-" + index, new BigDecimal(100).multiply(entry.getValue())

                           .divide(sum, 2, BigDecimal.ROUND_HALF_UP).doubleValue());

								
                     }

                  }

               }

               break;