|
@@ -74,8 +74,8 @@ public class IndexBaseDto {
|
|
|
public void setIndexMonthData(List<IndexBaseMonthData> indexMonthData, Date currentMonth) {
|
|
|
this.indexMonthData = indexMonthData;
|
|
|
if(!CollectionUtils.isEmpty(indexMonthData)){
|
|
|
- if(dataType.getCollect()){
|
|
|
- BigDecimal total = indexMonthData.stream().map(IndexBaseMonthData::getTotalNum).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
+ BigDecimal total = indexMonthData.stream().map(IndexBaseMonthData::getTotalNum).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
+ if(IndexDataType.ACTIVATION_RATE.equals(dataType)){
|
|
|
if(total.compareTo(BigDecimal.ZERO)==0){
|
|
|
this.percent = BigDecimal.ZERO;
|
|
|
}else{
|