Merge remote-tracking branch 'origin/master'

src/main/java/com/nokia/finance/tasks/dao/car/CarReportDao.java

@@ -333,7 +333,7 @@ select
     b.budget
 from
     t101
-join car.car_yu_suan b on
+left join car.car_yu_suan b on
     t101.second_org_no = b.area_no
     and t101.year_no = b.year_no
 ),

src/main/java/com/nokia/finance/tasks/pojo/vo/car_report/CarSnfyVo.java

@@ -73,10 +73,10 @@ public class CarSnfyVo {
         DecimalFormat percentFormat = new DecimalFormat("0.00%");
         this.tyFy = numberFormat.format(carSnfyPo.getTyFy());
         this.lyFy = numberFormat.format(carSnfyPo.getLyFy());
-        this.budgetLj = numberFormat.format(carSnfyPo.getBudgetLj());
+        this.budgetLj = carSnfyPo.getBudgetLj() == null ? "" : numberFormat.format(carSnfyPo.getBudgetLj());
         this.tbzj =  numberFormat.format(carSnfyPo.getTbzj());
         this.tbbfb = carSnfyPo.getTbbfb() == null ? "" : percentFormat.format(carSnfyPo.getTbbfb());
-        this.yspc = numberFormat.format(carSnfyPo.getYspc());
+        this.yspc = carSnfyPo.getYspc() == null ? "" : numberFormat.format(carSnfyPo.getYspc());
         this.yspcbfb = carSnfyPo.getYspcbfb() == null ? "" : percentFormat.format(carSnfyPo.getYspcbfb());
     }
 }