|
@@ -944,6 +944,9 @@ public class IndexServiceImpl implements IndexService {
|
|
|
BigDecimal sumLreYear = countLre(taskNoListNew);
|
|
|
System.out.println("当年的利润额为:");
|
|
|
System.out.println(sumLreYear);
|
|
|
+ if(sumLreYear == null){
|
|
|
+ sumLreYear = initValue;
|
|
|
+ }
|
|
|
lreDataInfoVo.setYearTotal(sumLreYear);
|
|
|
System.out.println("----------------------------------------------------");
|
|
|
|
|
@@ -954,15 +957,18 @@ public class IndexServiceImpl implements IndexService {
|
|
|
BigDecimal sumLreLastYear = countLre(taskNoListNew2);
|
|
|
System.out.println("上一年的利润额为:");
|
|
|
System.out.println(sumLreLastYear);
|
|
|
+ if(sumLreLastYear == null){
|
|
|
+ sumLreLastYear = initValue;
|
|
|
+ }
|
|
|
lreDataInfoVo.setYearTq(sumLreLastYear);
|
|
|
System.out.println("----------------------------------------------------");
|
|
|
|
|
|
//2.计算年同比增长率
|
|
|
try {
|
|
|
BigDecimal tbGrowthYear = ((sumLreYear.subtract(sumLreLastYear)).divide(sumLreLastYear, 2, RoundingMode.HALF_UP));
|
|
|
- lreDataInfoVo.setYearTb(tbGrowthYear);
|
|
|
System.out.println("年利润同比增长率为:");
|
|
|
System.out.println(tbGrowthYear);
|
|
|
+ lreDataInfoVo.setYearTb(tbGrowthYear);
|
|
|
System.out.println("----------------------------------------------------");
|
|
|
} catch (Exception e) {
|
|
|
lreDataInfoVo.setYearTb(eValue);
|
|
@@ -975,6 +981,9 @@ public class IndexServiceImpl implements IndexService {
|
|
|
BigDecimal sumLreCurrMonth = countLre(taskNoListNew3);
|
|
|
System.out.println("当月的利润额为:");
|
|
|
System.out.println(sumLreCurrMonth);
|
|
|
+ if(sumLreCurrMonth == null){
|
|
|
+ sumLreCurrMonth = initValue;
|
|
|
+ }
|
|
|
lreDataInfoVo.setMonthTotal(sumLreCurrMonth);
|
|
|
System.out.println("----------------------------------------------------");
|
|
|
|
|
@@ -985,6 +994,9 @@ public class IndexServiceImpl implements IndexService {
|
|
|
BigDecimal sumLreLastMonth = countLre(taskNoListNew4);
|
|
|
System.out.println("上个月的利润额为:");
|
|
|
System.out.println(sumLreLastMonth);
|
|
|
+ if(sumLreLastMonth == null){
|
|
|
+ sumLreLastMonth = initValue;
|
|
|
+ }
|
|
|
System.out.println("----------------------------------------------------");
|
|
|
|
|
|
//2.计算月环比增长率
|
|
@@ -1005,6 +1017,9 @@ public class IndexServiceImpl implements IndexService {
|
|
|
BigDecimal sumLreTqMonth = countLre(taskNoListNew5);
|
|
|
System.out.println("去年同期月份的利润额为:");
|
|
|
System.out.println(sumLreTqMonth);
|
|
|
+ if(sumLreTqMonth == null){
|
|
|
+ sumLreTqMonth = initValue;
|
|
|
+ }
|
|
|
System.out.println("----------------------------------------------------");
|
|
|
|
|
|
//2.计算月同比增长率
|