Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandover.java

@@ -93,4 +93,5 @@ public class BusHandover extends BaseEntity {
     private String trailerMobile;
     private Date trailerDeliverDate;
     private String trailerRemarks;
+    private Date closingDate;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.buscenter.biz.bushandover;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -2097,6 +2098,7 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
                 BusHandover updateStateEntity = fetchBySid(businessSid);
                 updateStateEntity.setHandoverStateKey("002");
                 updateStateEntity.setHandoverStateValue("已交车");
+                updateStateEntity.setClosingDate(new DateTime());
                 baseMapper.updateById(updateStateEntity);
                 //推对外交付资料记录表
                 List<BusHandoverItems> items = busHandoverItemsService.getItemsListByMainSid(businessSid).getData();

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

@@ -34,4 +34,110 @@ public class DailyReport {
     private String vehMConfigSid;
     @ApiModelProperty("配置名称")
     private String vehMConfigName;
+
+
+    @ApiModelProperty("存销比")
+    private String saleOfStockRatio;
+    @ApiModelProperty("库存总计")
+    private int stock_total;
+    @ApiModelProperty("库存未定")
+    private int stock_unreserve;
+    @ApiModelProperty("库存已定")
+    private int stock_reserve;
+    @ApiModelProperty("库存小计")
+    private int stock_subtotal;
+    @ApiModelProperty("库存-买断未定")
+    private int stock_buyout_unreserve;
+    @ApiModelProperty("库存-买断已定")
+    private int stock_buyout_reserve;
+    @ApiModelProperty("库存-买断小计")
+    private int stock_buyout_subtotal;
+    @ApiModelProperty("排产-未定")
+    private int pcOrder_unreserve;
+    @ApiModelProperty("排产-已定")
+    private int pcOrder_reserve;
+    @ApiModelProperty("排产-小计")
+    private int pcOrder_subtotal;
+    @ApiModelProperty("简易订单-本日")
+    private int simpleOrder_day;
+    @ApiModelProperty("简易订单-本月")
+    private int simpleOrder_month;
+    @ApiModelProperty("销售订单-全款-本日")
+    private int saleOrder_full_day;
+    @ApiModelProperty("销售订单-贷款-本日")
+    private int saleOrder_loan_day;
+    @ApiModelProperty("销售订单-小计-本日")
+    private int saleOrder_subtotal_day;
+    @ApiModelProperty("销售订单-全款-本月")
+    private int saleOrder_full_month;
+    @ApiModelProperty("销售订单-贷款-本月")
+    private int saleOrder_loan_month;
+    @ApiModelProperty("销售订单-小计-本月")
+    private int saleOrder_subtotal_month;
+    @ApiModelProperty("销售订单-待交车累计")
+    private int saleOrder_waitVeh_total;
+    @ApiModelProperty("销售-全款-本日")
+    private int sale_full_day;
+    @ApiModelProperty("销售-贷款-本日")
+    private int sale_loan_day;
+    @ApiModelProperty("销售-小计-本日")
+    private int sale_subtotal_day;
+    @ApiModelProperty("销售-全款-本月")
+    private int sale_full_month;
+    @ApiModelProperty("销售-贷款-本月")
+    private int sale_loan_month;
+    @ApiModelProperty("销售-小计-本月")
+    private int sale_subtotal_month;
+    @ApiModelProperty("销售-全款-本年")
+    private int sale_full_year;
+    @ApiModelProperty("销售-贷款-本年")
+    private int sale_loan_year;
+    @ApiModelProperty("销售-小计-本年")
+    private int sale_subtotal_year;
+    @ApiModelProperty("厂家开票数-全年")
+    private int manufacturer_invoicing_year;
+    @ApiModelProperty("买断-本日")
+    private int buyout_day;
+    @ApiModelProperty("买断-本月")
+    private int buyout_month;
+    @ApiModelProperty("买断-本年")
+    private int buyout_year;
+    @ApiModelProperty("欠款提车-数量")
+    private int arrears_carry_veh_count;
+    @ApiModelProperty("欠款提车-金额")
+    private String arrears_carry_veh_amount;
+    @ApiModelProperty("金融未放款-数量")
+    private int loan_not_count;
+    @ApiModelProperty("金融未放款-金额")
+    private String loan_not_amount;
+
+
+    @ApiModelProperty("本日交付贷款")
+    private String deliver_loan_day;
+
+    @ApiModelProperty("本日交付全款")
+    private String deliver_full_day;
+
+    @ApiModelProperty("本日交付小计")
+    private String deliver_subtotal_day;
+
+    @ApiModelProperty("本月交付贷款")
+    private String deliver_loan_month;
+
+    @ApiModelProperty("本月交付全款")
+    private String deliver_full_month;
+
+    @ApiModelProperty("本月交付小计")
+    private String deliver_subtotal_month;
+
+    @ApiModelProperty("全年交付贷款")
+    private String deliver_loan_year;
+
+    @ApiModelProperty("全年交付全款")
+    private String deliver_full_year;
+
+    @ApiModelProperty("全年交付小计")
+    private String deliver_subtotal_year;
+
+
 }

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

@@ -30,6 +30,11 @@ public interface DailyReportFeign {
     @ResponseBody
     ResultBean<PagerVo<DailyReportVo>> listPage(@RequestBody PagerQuery<DailyReportQuery> pagerQuery);
 
+    /**
+     * 获取动态列
+     * @param useOrgSid
+     * @return
+     */
     @GetMapping("selectListByUseOrgSid")
     @ResponseBody
     ResultBean<List<DailyParameterVo>> selectListByUseOrgSid(@RequestParam("useOrgSid")String useOrgSid);

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

@@ -114,6 +114,33 @@ public class DailyReportVo implements Vo {
     private String loan_not_amount;
     @ApiModelProperty("备注")
     private String remarks;
+
+    @ApiModelProperty("本日交付贷款")
+    private String deliver_loan_day;
+
+    @ApiModelProperty("本日交付全款")
+    private String deliver_full_day;
+
+    @ApiModelProperty("本日交付小计")
+    private String deliver_subtotal_day;
+
+    @ApiModelProperty("本月交付贷款")
+    private String deliver_loan_month;
+
+    @ApiModelProperty("本月交付全款")
+    private String deliver_full_month;
+
+    @ApiModelProperty("本月交付小计")
+    private String deliver_subtotal_month;
+
+    @ApiModelProperty("全年交付贷款")
+    private String deliver_loan_year;
+
+    @ApiModelProperty("全年交付全款")
+    private String deliver_full_year;
+
+    @ApiModelProperty("全年交付小计")
+    private String deliver_subtotal_year;
     //=========================================================车型配置相关参数
     @ApiModelProperty("车身颜色")
     private String carColor;