| | |
|---|
| | | }); |
|---|
| | | } |
|---|
| | | }else { |
|---|
| | | BigDecimal dataValue = Objects.nonNull(list.getDataValue())?BigDecimal.valueOf(Integer.parseInt(list.getDataValue())):BigDecimal.ZERO; |
|---|
| | | BigDecimal dataValue = Objects.nonNull(list.getDataValue())?BigDecimal.valueOf(Double.parseDouble(list.getDataValue())):BigDecimal.ZERO; |
|---|
| | | result.forEach(it->{ |
|---|
| | | it.setAvgNum(it.getAvgNum().add(dataValue)); |
|---|
| | | }); |
|---|
| | |
|---|
| | | private BigDecimal numAvg(List<String> list , BigDecimal num){ |
|---|
| | | int nums = 1; |
|---|
| | | for (int i=0;i<list.size();i=i+2){ |
|---|
| | | if(num.compareTo(BigDecimal.valueOf(Integer.parseInt(list.get(i))))>= 0 ){ |
|---|
| | | return num.add(BigDecimal.valueOf(Integer.parseInt(list.get(nums)))); |
|---|
| | | if(num.compareTo(BigDecimal.valueOf(Double.parseDouble(list.get(i))))>= 0 ){ |
|---|
| | | return num.add(BigDecimal.valueOf(Double.parseDouble(list.get(i+1)))); |
|---|
| | | } |
|---|
| | | nums+=2; |
|---|
| | | } |
|---|
