报表中心

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml

@@ -638,6 +638,7 @@
     <select id="selectByBorrowSidAndOrder"
             resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigate">
         select * from anrui_riskcenter.loan_homevisit_investigate where saleOrderSid = #{salesOrderSid} and saleOrderBorrowerSid = #{borrowerSid}
+        order by id desc limit 1
     </select>
 
     <select id="selectCustomer"

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/BrandVo.java

@@ -14,5 +14,5 @@ public class BrandVo {
 
     private String colspan;
 
-    private String brandSid;
+    private String linkSid;
 }

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportAppVo.java

@@ -103,6 +103,14 @@ public class DailyReportAppVo {
     private List<String> row44 = new ArrayList<>();
     @ApiModelProperty("买断-本年")
     private List<String> row45 = new ArrayList<>();
+    @ApiModelProperty("欠款出库数量")
+    private List<String> row46 = new ArrayList<>();
+    @ApiModelProperty("欠款出库金额")
+    private List<String> row47 = new ArrayList<>();
+    @ApiModelProperty("金融未放款数量")
+    private List<String> row48 = new ArrayList<>();
+    @ApiModelProperty("金融未放款金额")
+    private List<String> row49 = new ArrayList<>();
 
 
     private List<DailyReportVo> dailyReportVoList = new ArrayList<>();

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java

@@ -89,4 +89,9 @@ public interface DailyReportFeign {
     @ResponseBody
     ResultBean<ReportVo> getReport(@RequestParam("date")String date);
 
+    @ApiOperation("集团下事业部日报表")
+    @GetMapping("list2")
+    @ResponseBody
+    ResultBean<DailyReportAppVo> list2(@RequestParam("date")String date);
+
 }

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java

@@ -46,4 +46,8 @@ public interface DailyReportMapper extends BaseMapper<DailyReport> {
     IPage<DailyReportListVo> pageList1(IPage<DailyReport> page, @Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
 
     ReportVo getReport(@Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
+
+    List<DailyReportVo> selectReport2(String date);
+
+    List<BrandVo> list2(String date);
 }

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml

@@ -102,7 +102,7 @@
     </select>
 
     <select id="selectByBrand" resultType="com.yxt.anrui.reportcenter.api.dailyreport.BrandVo">
-        SELECT dr.brandSid,
+        SELECT dr.brandSid  linkSid,
                dr.brandName NAME,
                (
                    SELECT count(ddr.vehModelSid)
@@ -255,4 +255,66 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="selectReport2" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo">
+        select ifnull(sum(saleOfStockRatio), 0)            as saleOfStockRatio,
+               ifnull(sum(stock_subtotal), 0)              as stock_subtotal,
+               ifnull(sum(stock_unreserve), 0)             as stock_unreserve,
+               ifnull(sum(stock_reserve), 0)               as stock_reserve,
+               ifnull(sum(stock_buyout_unreserve), 0)      as stock_buyout_unreserve,
+               ifnull(sum(stock_buyout_reserve), 0)        as stock_buyout_reserve,
+               ifnull(sum(stock_buyout_subtotal), 0)       as stock_buyout_subtotal,
+               ifnull(sum(pcOrder_unreserve), 0)           as pcOrder_unreserve,
+               ifnull(sum(pcOrder_reserve), 0)             as pcOrder_reserve,
+               ifnull(sum(pcOrder_subtotal), 0)            as pcOrder_subtotal,
+
+               ifnull(sum(simpleOrder_day), 0)             as simpleOrder_day,
+               ifnull(sum(simpleOrder_month), 0)           as simpleOrder_month,
+               ifnull(sum(saleOrder_full_day), 0)          as saleOrder_full_day,
+               ifnull(sum(saleOrder_loan_day), 0)          as saleOrder_loan_day,
+               ifnull(sum(saleOrder_subtotal_day), 0)      as saleOrder_subtotal_day,
+               ifnull(sum(saleOrder_full_month), 0)        as saleOrder_full_month,
+               ifnull(sum(saleOrder_loan_month), 0)        as saleOrder_loan_month,
+               ifnull(sum(saleOrder_subtotal_month), 0)    as saleOrder_subtotal_month,
+               ifnull(sum(saleOrder_waitVeh_total), 0)     as saleOrder_waitVeh_total,
+
+               ifnull(sum(sale_full_day), 0)               as sale_full_day,
+               ifnull(sum(sale_loan_day), 0)               as sale_loan_day,
+               ifnull(sum(sale_subtotal_day), 0)           as sale_subtotal_day,
+               ifnull(sum(sale_full_month), 0)             as sale_full_month,
+               ifnull(sum(sale_loan_month), 0)             as sale_loan_month,
+               ifnull(sum(sale_subtotal_month), 0)         as sale_subtotal_month,
+               ifnull(sum(sale_full_year), 0)              as sale_full_year,
+               ifnull(sum(sale_loan_year), 0)              as sale_loan_year,
+               ifnull(sum(sale_subtotal_year), 0)          as sale_subtotal_year,
+               ifnull(sum(deliver_loan_day), 0)            as deliver_loan_day,
+               ifnull(sum(deliver_full_day), 0)            as deliver_full_day,
+               ifnull(sum(deliver_subtotal_day), 0)        as deliver_subtotal_day,
+               ifnull(sum(deliver_loan_month), 0)          as deliver_loan_month,
+               ifnull(sum(deliver_full_month), 0)          as deliver_full_month,
+               ifnull(sum(deliver_subtotal_month), 0)      as deliver_subtotal_month,
+               ifnull(sum(deliver_loan_year), 0)           as deliver_loan_year,
+               ifnull(sum(deliver_full_year), 0)           as deliver_full_year,
+               ifnull(sum(deliver_subtotal_year), 0)       as deliver_subtotal_year,
+               ifnull(sum(manufacturer_invoicing_year), 0) as manufacturer_invoicing_year,
+               ifnull(sum(buyout_day), 0)                  as buyout_day,
+               ifnull(sum(buyout_month), 0)                as buyout_month,
+               ifnull(sum(buyout_year), 0)                 as buyout_year,
+               ifnull(sum(arrears_carry_veh_count), 0)     as arrears_carry_veh_count,
+               ifnull(sum(arrears_carry_veh_amount), 0)    as arrears_carry_veh_amount,
+               ifnull(sum(loan_not_count), 0)              as loan_not_count,
+               ifnull(sum(loan_not_amount), 0)             as loan_not_amount
+        from daily_report
+        where createTime like concat('%', #{date}, '%')
+        group by busOrgSid
+        order by busOrgSid desc
+    </select>
+
+    <select id="list2" resultType="com.yxt.anrui.reportcenter.api.dailyreport.BrandVo">
+        select dr.busOrgSid linkSid, dr.busOrgName name, '1' as colspan
+        from daily_report dr
+        where createTime like concat('%', #{date}, '%')
+        group by dr.busOrgSid
+        order by dr.busOrgSid desc
+    </select>
 </mapper>

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportRest.java

@@ -87,4 +87,9 @@ public class DailyReportRest implements DailyReportFeign {
     public ResultBean<ReportVo> getReport(String date) {
         return dailyReportService.getReport(date);
     }
+
+    @Override
+    public ResultBean<DailyReportAppVo> list2(String date) {
+        return dailyReportService.list2(date);
+    }
 }

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java

@@ -309,7 +309,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         String sybOrgSid = "";
         if (StringUtils.isNotBlank(query.getOrgPath())) {
             List<String> stringList = Arrays.asList(query.getOrgPath().split("/"));
-            if(stringList.size()>=2){
+            if (stringList.size() >= 2) {
                 sybOrgSid = query.getOrgPath().substring(37, 73);
             }
 
@@ -318,7 +318,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
             List<BrandVo> rows1 = baseMapper.selectByBrand(sybOrgSid, query.getQueryTime());
             rows1.removeAll(Collections.singleton(null));
             dailyReportAppVo.setRow1(rows1);
-            List<String> brandList = rows1.stream().map(v -> v.getBrandSid()).collect(Collectors.toList());
+            List<String> brandList = rows1.stream().map(v -> v.getLinkSid()).collect(Collectors.toList());
             List<DailyReportVo> dailyReportVoList = baseMapper.selectReport(brandList, sybOrgSid, query.getQueryTime());
             //燃料
             List<String> row2 = dailyReportVoList.stream().map(v -> v.getFuelTypeValue()).collect(Collectors.toList());
@@ -419,74 +419,145 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
             dailyReportAppVo.setRow21(row21);
             //订车-本月销售订单-小计
             List<String> row22 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSaleOrder_subtotal_month())).collect(Collectors.toList());
+            BigDecimal row22All = row22.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row22.add(row22All.toString());
             dailyReportAppVo.setRow22(row22);
             //订车-待交车累计总订单
             List<String> row23 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSaleOrder_waitVeh_total())).collect(Collectors.toList());
+            BigDecimal row23All = row23.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row23.add(row23All.toString());
             dailyReportAppVo.setRow23(row23);
             //销售-本日销售-贷款
             List<String> row24 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSale_loan_day())).collect(Collectors.toList());
+            BigDecimal row24All = row24.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row24.add(row24All.toString());
             dailyReportAppVo.setRow24(row24);
             //销售-本日销售-全款
             List<String> row25 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSale_full_day())).collect(Collectors.toList());
+            BigDecimal row25All = row25.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row25.add(row25All.toString());
             dailyReportAppVo.setRow25(row25);
             //销售-本日销售-小计
             List<String> row26 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSale_subtotal_day())).collect(Collectors.toList());
+            BigDecimal row26All = row26.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row26.add(row26All.toString());
             dailyReportAppVo.setRow26(row26);
             //销售-本月销售-贷款
             List<String> row27 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSale_loan_month())).collect(Collectors.toList());
+            BigDecimal row27All = row27.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row27.add(row27All.toString());
             dailyReportAppVo.setRow27(row27);
             //销售-本月销售-全款
             List<String> row28 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSale_full_month())).collect(Collectors.toList());
+            BigDecimal row28All = row28.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row28.add(row28All.toString());
             dailyReportAppVo.setRow28(row28);
             //销售-本月销售-小计
             List<String> row29 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSale_subtotal_month())).collect(Collectors.toList());
+            BigDecimal row29All = row29.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row29.add(row29All.toString());
             dailyReportAppVo.setRow29(row29);
             //销售-全年销售-贷款
             List<String> row30 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSale_loan_year())).collect(Collectors.toList());
+            BigDecimal row30All = row30.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row30.add(row30All.toString());
             dailyReportAppVo.setRow30(row30);
             //销售-全年销售-全款
             List<String> row31 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSale_full_year())).collect(Collectors.toList());
+            BigDecimal row31All = row31.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row31.add(row31All.toString());
             dailyReportAppVo.setRow31(row31);
             //销售-全年销售-小计
             List<String> row32 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSale_subtotal_year())).collect(Collectors.toList());
+            BigDecimal row32All = row32.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row32.add(row32All.toString());
             dailyReportAppVo.setRow32(row32);
             //交付-本日交付-贷款
             List<String> row33 = dailyReportVoList.stream().map(v -> String.valueOf(v.getDeliver_loan_day())).collect(Collectors.toList());
+            BigDecimal row33All = row33.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row33.add(row33All.toString());
             dailyReportAppVo.setRow33(row33);
             //交付-本日交付-全款
             List<String> row34 = dailyReportVoList.stream().map(v -> String.valueOf(v.getDeliver_full_day())).collect(Collectors.toList());
+            BigDecimal row34All = row34.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row34.add(row34All.toString());
             dailyReportAppVo.setRow34(row34);
             //交付-本日交付-小计
             List<String> row35 = dailyReportVoList.stream().map(v -> String.valueOf(v.getDeliver_subtotal_day())).collect(Collectors.toList());
+            BigDecimal row35All = row35.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row35.add(row35All.toString());
             dailyReportAppVo.setRow35(row35);
             //交付-本月交付-贷款
             List<String> row36 = dailyReportVoList.stream().map(v -> String.valueOf(v.getDeliver_loan_month())).collect(Collectors.toList());
+            BigDecimal row36All = row36.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row36.add(row36All.toString());
             dailyReportAppVo.setRow36(row36);
             //交付-本月交付-全款
             List<String> row37 = dailyReportVoList.stream().map(v -> String.valueOf(v.getDeliver_full_month())).collect(Collectors.toList());
+            BigDecimal row37All = row37.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row37.add(row37All.toString());
             dailyReportAppVo.setRow37(row37);
             //交付-本月交付-小计
             List<String> row38 = dailyReportVoList.stream().map(v -> String.valueOf(v.getDeliver_subtotal_month())).collect(Collectors.toList());
+            BigDecimal row38All = row38.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row38.add(row38All.toString());
             dailyReportAppVo.setRow38(row38);
             //交付-全年交付-贷款
             List<String> row39 = dailyReportVoList.stream().map(v -> String.valueOf(v.getDeliver_loan_year())).collect(Collectors.toList());
+            BigDecimal row39All = row39.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row39.add(row39All.toString());
             dailyReportAppVo.setRow39(row39);
             //交付-全年交付-全款
             List<String> row40 = dailyReportVoList.stream().map(v -> String.valueOf(v.getDeliver_full_year())).collect(Collectors.toList());
+            BigDecimal row40All = row40.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row40.add(row40All.toString());
             dailyReportAppVo.setRow40(row40);
             //交付-全年交付-小计
             List<String> row41 = dailyReportVoList.stream().map(v -> String.valueOf(v.getDeliver_subtotal_year())).collect(Collectors.toList());
+            BigDecimal row41All = row41.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row41.add(row41All.toString());
             dailyReportAppVo.setRow41(row41);
             //全年厂家开票数
+            List<String> row42 = dailyReportVoList.stream().map(v -> String.valueOf(v.getManufacturer_invoicing_year())).collect(Collectors.toList());
+            BigDecimal row42All = row42.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row42.add(row42All.toString());
+            dailyReportAppVo.setRow42(row42);
             //买断-本日
             List<String> row43 = dailyReportVoList.stream().map(v -> String.valueOf(v.getBuyout_day())).collect(Collectors.toList());
+            BigDecimal row43All = row43.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row43.add(row43All.toString());
             dailyReportAppVo.setRow43(row43);
             //买断-本月
             List<String> row44 = dailyReportVoList.stream().map(v -> String.valueOf(v.getBuyout_month())).collect(Collectors.toList());
+            BigDecimal row44All = row44.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row44.add(row44All.toString());
             dailyReportAppVo.setRow44(row44);
             //买断-本年
             List<String> row45 = dailyReportVoList.stream().map(v -> String.valueOf(v.getBuyout_year())).collect(Collectors.toList());
+            BigDecimal row45All = row45.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row45.add(row45All.toString());
             dailyReportAppVo.setRow45(row45);
+            //欠款出库数量
+            List<String> row46 = dailyReportVoList.stream().map(v -> String.valueOf(v.getArrears_carry_veh_count())).collect(Collectors.toList());
+            BigDecimal row46All = row46.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row46.add(row46All.toString());
+            dailyReportAppVo.setRow46(row46);
+            //欠款出库金额
+            List<String> row47 = dailyReportVoList.stream().map(v -> String.valueOf(v.getArrears_carry_veh_amount())).collect(Collectors.toList());
+            BigDecimal row47All = row47.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row47.add(row47All.toString());
+            dailyReportAppVo.setRow47(row47);
+            //金融未放款-数量
+            List<String> row48 = dailyReportVoList.stream().map(v -> String.valueOf(v.getLoan_not_count())).collect(Collectors.toList());
+            BigDecimal row48All = row48.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row48.add(row48All.toString());
+            dailyReportAppVo.setRow48(row48);
+            //金融未放款-金额
+            List<String> row49 = dailyReportVoList.stream().map(v -> String.valueOf(v.getLoan_not_amount())).collect(Collectors.toList());
+            BigDecimal row49All = row49.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            row49.add(row49All.toString());
+            dailyReportAppVo.setRow49(row49);
+
         }
 
         return rb.success().setData(dailyReportAppVo);
@@ -513,4 +584,245 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
         ReportVo reportVo = baseMapper.getReport(qw);
         return rb.success().setData(reportVo);
     }
+
+    public ResultBean<DailyReportAppVo> list2(String date) {
+        ResultBean<DailyReportAppVo> rb = ResultBean.fireFail();
+        DailyReportAppVo dailyReportAppVo = new DailyReportAppVo();
+        List<BrandVo> rows1 = baseMapper.list2(date);
+        rows1.removeAll(Collections.singleton(null));
+        dailyReportAppVo.setRow1(rows1);
+        List<DailyReportVo> dailyReportVoList = baseMapper.selectReport2(date);
+        //存销比
+        List<String> row4 = dailyReportVoList.stream().map(v -> v.getSaleOfStockRatio()).collect(Collectors.toList());
+        //合计
+        BigDecimal row4All = row4.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row4.add(row4All.toString());
+        dailyReportAppVo.setRow4(row4);
+        //库存总计
+        List<String> row5 = dailyReportVoList.stream().map(v -> String.valueOf(v.getStock_total())).collect(Collectors.toList());
+        BigDecimal row5All = row5.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row5.add(row5All.toString());
+        dailyReportAppVo.setRow5(row5);
+        //库存未定
+        List<String> row6 = dailyReportVoList.stream().map(v -> String.valueOf(v.getStock_unreserve())).collect(Collectors.toList());
+        BigDecimal row6All = row6.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row6.add(row6All.toString());
+        dailyReportAppVo.setRow6(row6);
+        //库存-已定
+        List<String> row7 = dailyReportVoList.stream().map(v -> String.valueOf(v.getStock_reserve())).collect(Collectors.toList());
+        BigDecimal row7All = row7.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row7.add(row7All.toString());
+        dailyReportAppVo.setRow7(row7);
+        //库存-小计
+        List<String> row8 = dailyReportVoList.stream().map(v -> String.valueOf(v.getStock_subtotal())).collect(Collectors.toList());
+        BigDecimal row8All = row8.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row8.add(row8All.toString());
+        dailyReportAppVo.setRow8(row8);
+        //其中买断-未定
+        List<String> row9 = dailyReportVoList.stream().map(v -> String.valueOf(v.getStock_buyout_unreserve())).collect(Collectors.toList());
+        BigDecimal row9All = row9.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row9.add(row9All.toString());
+        dailyReportAppVo.setRow9(row9);
+        //其中买断-已定
+        List<String> row10 = dailyReportVoList.stream().map(v -> String.valueOf(v.getStock_buyout_reserve())).collect(Collectors.toList());
+        BigDecimal row10All = row10.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row10.add(row10All.toString());
+        dailyReportAppVo.setRow10(row10);
+        //其中买断-小计
+        List<String> row11 = dailyReportVoList.stream().map(v -> String.valueOf(v.getStock_buyout_subtotal())).collect(Collectors.toList());
+        BigDecimal row11All = row11.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row11.add(row11All.toString());
+        dailyReportAppVo.setRow11(row11);
+        //排产-未定
+        List<String> row12 = dailyReportVoList.stream().map(v -> String.valueOf(v.getPcOrder_unreserve())).collect(Collectors.toList());
+        BigDecimal row12All = row12.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row12.add(row12All.toString());
+        dailyReportAppVo.setRow12(row12);
+        //排产-已定
+        List<String> row13 = dailyReportVoList.stream().map(v -> String.valueOf(v.getPcOrder_reserve())).collect(Collectors.toList());
+        BigDecimal row13All = row13.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row13.add(row13All.toString());
+        dailyReportAppVo.setRow13(row13);
+        //排产-小计
+        List<String> row14 = dailyReportVoList.stream().map(v -> String.valueOf(v.getPcOrder_subtotal())).collect(Collectors.toList());
+        BigDecimal row14All = row14.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row14.add(row14All.toString());
+        dailyReportAppVo.setRow14(row14);
+        //订车-简易订单-本日
+        List<String> row15 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSimpleOrder_day())).collect(Collectors.toList());
+        BigDecimal row15All = row15.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row15.add(row15All.toString());
+        dailyReportAppVo.setRow15(row15);
+        //订车-简易订单-本月
+        List<String> row16 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSimpleOrder_month())).collect(Collectors.toList());
+        BigDecimal row16All = row16.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row16.add(row16All.toString());
+        dailyReportAppVo.setRow16(row16);
+        //订车-本日销售订单-贷款
+        List<String> row17 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSaleOrder_loan_day())).collect(Collectors.toList());
+        BigDecimal row17All = row17.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row17.add(row17All.toString());
+        dailyReportAppVo.setRow17(row17);
+        //订车-本日销售订单-全款
+        List<String> row18 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSaleOrder_full_day())).collect(Collectors.toList());
+        BigDecimal row18All = row18.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row18.add(row18All.toString());
+        dailyReportAppVo.setRow18(row18);
+        //订车-本日销售订单-小计
+        List<String> row19 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSaleOrder_subtotal_day())).collect(Collectors.toList());
+        BigDecimal row19All = row19.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row19.add(row19All.toString());
+        dailyReportAppVo.setRow19(row19);
+        //订车-本月销售订单-贷款
+        List<String> row20 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSaleOrder_loan_month())).collect(Collectors.toList());
+        BigDecimal row20All = row20.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row20.add(row20All.toString());
+        dailyReportAppVo.setRow20(row20);
+        //订车-本月销售订单-全款
+        List<String> row21 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSaleOrder_full_month())).collect(Collectors.toList());
+        BigDecimal row21All = row21.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row21.add(row21All.toString());
+        dailyReportAppVo.setRow21(row21);
+        //订车-本月销售订单-小计
+        List<String> row22 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSaleOrder_subtotal_month())).collect(Collectors.toList());
+        BigDecimal row22All = row22.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row22.add(row22All.toString());
+        dailyReportAppVo.setRow22(row22);
+        //订车-待交车累计总订单
+        List<String> row23 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSaleOrder_waitVeh_total())).collect(Collectors.toList());
+        BigDecimal row23All = row23.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row23.add(row23All.toString());
+        dailyReportAppVo.setRow23(row23);
+        //销售-本日销售-贷款
+        List<String> row24 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSale_loan_day())).collect(Collectors.toList());
+        BigDecimal row24All = row24.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row24.add(row24All.toString());
+        dailyReportAppVo.setRow24(row24);
+        //销售-本日销售-全款
+        List<String> row25 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSale_full_day())).collect(Collectors.toList());
+        BigDecimal row25All = row25.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row25.add(row25All.toString());
+        dailyReportAppVo.setRow25(row25);
+        //销售-本日销售-小计
+        List<String> row26 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSale_subtotal_day())).collect(Collectors.toList());
+        BigDecimal row26All = row26.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row26.add(row26All.toString());
+        dailyReportAppVo.setRow26(row26);
+        //销售-本月销售-贷款
+        List<String> row27 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSale_loan_month())).collect(Collectors.toList());
+        BigDecimal row27All = row27.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row27.add(row27All.toString());
+        dailyReportAppVo.setRow27(row27);
+        //销售-本月销售-全款
+        List<String> row28 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSale_full_month())).collect(Collectors.toList());
+        BigDecimal row28All = row28.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row28.add(row28All.toString());
+        dailyReportAppVo.setRow28(row28);
+        //销售-本月销售-小计
+        List<String> row29 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSale_subtotal_month())).collect(Collectors.toList());
+        BigDecimal row29All = row29.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row29.add(row29All.toString());
+        dailyReportAppVo.setRow29(row29);
+        //销售-全年销售-贷款
+        List<String> row30 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSale_loan_year())).collect(Collectors.toList());
+        BigDecimal row30All = row30.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row30.add(row30All.toString());
+        dailyReportAppVo.setRow30(row30);
+        //销售-全年销售-全款
+        List<String> row31 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSale_full_year())).collect(Collectors.toList());
+        BigDecimal row31All = row31.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row31.add(row31All.toString());
+        dailyReportAppVo.setRow31(row31);
+        //销售-全年销售-小计
+        List<String> row32 = dailyReportVoList.stream().map(v -> String.valueOf(v.getSale_subtotal_year())).collect(Collectors.toList());
+        BigDecimal row32All = row32.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row32.add(row32All.toString());
+        dailyReportAppVo.setRow32(row32);
+        //交付-本日交付-贷款
+        List<String> row33 = dailyReportVoList.stream().map(v -> String.valueOf(v.getDeliver_loan_day())).collect(Collectors.toList());
+        BigDecimal row33All = row33.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row33.add(row33All.toString());
+        dailyReportAppVo.setRow33(row33);
+        //交付-本日交付-全款
+        List<String> row34 = dailyReportVoList.stream().map(v -> String.valueOf(v.getDeliver_full_day())).collect(Collectors.toList());
+        BigDecimal row34All = row34.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row34.add(row34All.toString());
+        dailyReportAppVo.setRow34(row34);
+        //交付-本日交付-小计
+        List<String> row35 = dailyReportVoList.stream().map(v -> String.valueOf(v.getDeliver_subtotal_day())).collect(Collectors.toList());
+        BigDecimal row35All = row35.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row35.add(row35All.toString());
+        dailyReportAppVo.setRow35(row35);
+        //交付-本月交付-贷款
+        List<String> row36 = dailyReportVoList.stream().map(v -> String.valueOf(v.getDeliver_loan_month())).collect(Collectors.toList());
+        BigDecimal row36All = row36.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row36.add(row36All.toString());
+        dailyReportAppVo.setRow36(row36);
+        //交付-本月交付-全款
+        List<String> row37 = dailyReportVoList.stream().map(v -> String.valueOf(v.getDeliver_full_month())).collect(Collectors.toList());
+        BigDecimal row37All = row37.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row37.add(row37All.toString());
+        dailyReportAppVo.setRow37(row37);
+        //交付-本月交付-小计
+        List<String> row38 = dailyReportVoList.stream().map(v -> String.valueOf(v.getDeliver_subtotal_month())).collect(Collectors.toList());
+        BigDecimal row38All = row38.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row38.add(row38All.toString());
+        dailyReportAppVo.setRow38(row38);
+        //交付-全年交付-贷款
+        List<String> row39 = dailyReportVoList.stream().map(v -> String.valueOf(v.getDeliver_loan_year())).collect(Collectors.toList());
+        BigDecimal row39All = row39.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row39.add(row39All.toString());
+        dailyReportAppVo.setRow39(row39);
+        //交付-全年交付-全款
+        List<String> row40 = dailyReportVoList.stream().map(v -> String.valueOf(v.getDeliver_full_year())).collect(Collectors.toList());
+        BigDecimal row40All = row40.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row40.add(row40All.toString());
+        dailyReportAppVo.setRow40(row40);
+        //交付-全年交付-小计
+        List<String> row41 = dailyReportVoList.stream().map(v -> String.valueOf(v.getDeliver_subtotal_year())).collect(Collectors.toList());
+        BigDecimal row41All = row41.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row41.add(row41All.toString());
+        dailyReportAppVo.setRow41(row41);
+        //全年厂家开票数
+        List<String> row42 = dailyReportVoList.stream().map(v -> String.valueOf(v.getManufacturer_invoicing_year())).collect(Collectors.toList());
+        BigDecimal row42All = row42.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row42.add(row42All.toString());
+        dailyReportAppVo.setRow42(row42);
+        //买断-本日
+        List<String> row43 = dailyReportVoList.stream().map(v -> String.valueOf(v.getBuyout_day())).collect(Collectors.toList());
+        BigDecimal row43All = row43.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row43.add(row43All.toString());
+        dailyReportAppVo.setRow43(row43);
+        //买断-本月
+        List<String> row44 = dailyReportVoList.stream().map(v -> String.valueOf(v.getBuyout_month())).collect(Collectors.toList());
+        BigDecimal row44All = row44.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row44.add(row44All.toString());
+        dailyReportAppVo.setRow44(row44);
+        //买断-本年
+        List<String> row45 = dailyReportVoList.stream().map(v -> String.valueOf(v.getBuyout_year())).collect(Collectors.toList());
+        BigDecimal row45All = row45.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row45.add(row45All.toString());
+        dailyReportAppVo.setRow45(row45);
+        //欠款出库数量
+        List<String> row46 = dailyReportVoList.stream().map(v -> String.valueOf(v.getArrears_carry_veh_count())).collect(Collectors.toList());
+        BigDecimal row46All = row46.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row46.add(row46All.toString());
+        dailyReportAppVo.setRow46(row46);
+        //欠款出库金额
+        List<String> row47 = dailyReportVoList.stream().map(v -> String.valueOf(v.getArrears_carry_veh_amount())).collect(Collectors.toList());
+        BigDecimal row47All = row47.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row47.add(row47All.toString());
+        dailyReportAppVo.setRow47(row47);
+        //金融未放款-数量
+        List<String> row48 = dailyReportVoList.stream().map(v -> String.valueOf(v.getLoan_not_count())).collect(Collectors.toList());
+        BigDecimal row48All = row48.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row48.add(row48All.toString());
+        dailyReportAppVo.setRow48(row48);
+        //金融未放款-金额
+        List<String> row49 = dailyReportVoList.stream().map(v -> String.valueOf(v.getLoan_not_amount())).collect(Collectors.toList());
+        BigDecimal row49All = row49.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        row49.add(row49All.toString());
+        dailyReportAppVo.setRow49(row49);
+        return rb.success().setData(dailyReportAppVo);
+    }
 }