Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -152,7 +152,7 @@ public interface BusSalesOrderFeign {
     ResultBean<List<BusSaleOrderNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap BusSaleOrderNodeQuery query);
 
     @ApiOperation(value = "加签")
-    @PostMapping(value = "/delegate")
+    @PutMapping(value = "/delegate")
     @ResponseBody
     public ResultBean delegate(@RequestBody BusSalesOrderDelegateQuery query);
 

doc/databases/报表中心.sql

@@ -112,7 +112,7 @@ UPDATE daily_report r
 SET r.`simpleOrder_month` = s.scount
 WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 
--- --------------------------------------------------------销售订单-本日-小计
+-- 销售订单-本日-小计
 UPDATE daily_report r
     INNER JOIN (select count(bv.id) as scount, bm.modelSid, bm.modelConfigSid, bo.useOrgSid
                 from anrui_buscenter.bus_sales_order bo
@@ -336,7 +336,44 @@ UPDATE daily_report r
 SET r.`sale_loan_year` = s.scount
 WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 
---
+-- 本日买断的台数
+
+UPDATE daily_report r
+    INNER JOIN (select count(bv.id) as scount, bv.modelSid, bv.modelConfigSid, bv.useOrgSid
+                from anrui_base.base_vehicle bv
+                where bv.solidDate like concat('%', CURDATE(), '%')
+                group by useOrgSid, modelSid, modelConfigSid
+    ) AS s ON r.useOrgSid = s.useOrgSid
+        AND r.vehModelSid = s.modelSid
+        AND r.vehMConfigSid = s.modelConfigSid
+SET r.`buyout_day` = s.scount
+WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
+
+-- 本月买断的台数
+
+UPDATE daily_report r
+    INNER JOIN (select count(bv.id) as scount, bv.modelSid, bv.modelConfigSid, bv.useOrgSid
+                from anrui_base.base_vehicle bv
+                where bv.solidDate like concat('%', DATE_FORMAT(CURDATE(), '%Y-%m'), '%')
+                group by useOrgSid, modelSid, modelConfigSid
+    ) AS s ON r.useOrgSid = s.useOrgSid
+        AND r.vehModelSid = s.modelSid
+        AND r.vehMConfigSid = s.modelConfigSid
+SET r.`buyout_month` = s.scount
+WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
+
+-- 本年买断的台数
+
+UPDATE daily_report r
+    INNER JOIN (select count(bv.id) as scount, bv.modelSid, bv.modelConfigSid, bv.useOrgSid
+                from anrui_base.base_vehicle bv
+                where bv.solidDate like concat('%', DATE_FORMAT(CURDATE(), '%Y'), '%')
+                group by useOrgSid, modelSid, modelConfigSid
+    ) AS s ON r.useOrgSid = s.useOrgSid
+        AND r.vehModelSid = s.modelSid
+        AND r.vehMConfigSid = s.modelConfigSid
+SET r.`buyout_year` = s.scount
+WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();