|
|
|
@ -203,9 +203,9 @@ public class IndexServiceImpl implements IndexService { |
|
|
|
labelList.add(nyear + "年"); |
|
|
|
BigDecimal[] rest = getDateMomeny(startdt, enddt); |
|
|
|
// 订单金额
|
|
|
|
ftlist.add(rest[0]); |
|
|
|
ftlist.add(dealPrice(rest[0])); |
|
|
|
// 标的
|
|
|
|
bdlist.add(rest[1]); |
|
|
|
bdlist.add(dealPrice(rest[1])); |
|
|
|
} |
|
|
|
|
|
|
|
}else if ("month".equals(leftDate)) {//按照月份
|
|
|
|
@ -215,9 +215,9 @@ public class IndexServiceImpl implements IndexService { |
|
|
|
String enddt = year +"-"+i+ "-31 23:59:59"; |
|
|
|
BigDecimal[] rest = getDateMomeny(startdt, enddt); |
|
|
|
// 订单金额
|
|
|
|
ftlist.add(rest[0]); |
|
|
|
ftlist.add(dealPrice(rest[0])); |
|
|
|
// 标的
|
|
|
|
bdlist.add(rest[1]); |
|
|
|
bdlist.add(dealPrice(rest[1])); |
|
|
|
} |
|
|
|
}else{ |
|
|
|
// 计算本月的天数,系统日期从0 开始,需要加上1
|
|
|
|
@ -229,9 +229,9 @@ public class IndexServiceImpl implements IndexService { |
|
|
|
String enddt = year +"-"+month+"-"+i+ " 23:59:59"; |
|
|
|
BigDecimal[] rest = getDateMomeny(startdt, enddt); |
|
|
|
// 订单金额
|
|
|
|
ftlist.add(rest[0]); |
|
|
|
ftlist.add(dealPrice(rest[0])); |
|
|
|
// 标的
|
|
|
|
bdlist.add(rest[1]); |
|
|
|
bdlist.add(dealPrice(rest[1])); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -273,4 +273,17 @@ public class IndexServiceImpl implements IndexService { |
|
|
|
BigDecimal[] dmarr = {dm, oderMoney}; |
|
|
|
return dmarr; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 判断 输入bigdecimal 是否为空值 |
|
|
|
* @param orbd |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
private BigDecimal dealPrice(BigDecimal orbd){ |
|
|
|
if(orbd==null){ |
|
|
|
return new BigDecimal(0); |
|
|
|
}else{ |
|
|
|
return orbd; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|