Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java

@@ -149,4 +149,10 @@ public class BaseAccadjApplyRest implements BaseAccadjApplyFeign {
     public ResultBean<AppCompanyAdjustVo> getCompanyAdjust(String sid) {
         return baseAccadjApplyService.getCompanyAdjust(sid);
     }
+
+    @PostMapping("pushReport")
+    @ApiOperation("测试推送车辆利润报表")
+    ResultBean pushReport(@RequestParam("sid")String sid){
+        return baseAccadjApplyService.pushReport(sid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -1400,4 +1400,11 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
         WordUtils.doc2pdf(wordPath, targetPath, pdfName, userName);
         return "/template/" + dateStr + "/" + pdfName;
     }
+
+    public ResultBean pushReport(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseAccadjApply baseAccadjApply = fetchBySid(sid);
+        pushCarSoldProfit(baseAccadjApply);
+        return rb.success();
+    }
 }

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java

@@ -184,6 +184,12 @@ public class CarsSoldProfitService extends MybatisBaseService<CarsSoldProfitMapp
                 if(StringUtils.isBlank(carsSoldProfitVo.getMakersSettlementPrice())){
                     carsSoldProfitVo.setMakersSettlementPrice("-");
                 }
+                if(StringUtils.isBlank(carsSoldProfitVo.getFinanceServiceCharge())){
+                    carsSoldProfitVo.setFinanceServiceCharge("-");
+                }
+                if(StringUtils.isBlank(carsSoldProfitVo.getMediatorRebatePrice())){
+                    carsSoldProfitVo.setMediatorRebatePrice("-");
+                }