diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java index 80284c3064..6891d22d65 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java @@ -5,6 +5,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.ResponseBody; /** @@ -27,7 +28,7 @@ public interface DailyReportFeign { */ @PostMapping("listPage") @ResponseBody - ResultBean> listPage(PagerQuery pagerQuery); + ResultBean> listPage(@RequestBody PagerQuery pagerQuery); /** * 按照生成日期、 @@ -38,7 +39,7 @@ public interface DailyReportFeign { */ @PostMapping("listPage2") @ResponseBody - ResultBean> listPage2(PagerQuery pagerQuery); + ResultBean> listPage2(@RequestBody PagerQuery pagerQuery); /** * 按照生成日期查询，按照事业部sid，品牌sid，车型sid，配置sid分组 @@ -48,5 +49,5 @@ public interface DailyReportFeign { */ @PostMapping("listPage3") @ResponseBody - ResultBean> listPage3(PagerQuery pagerQuery); + ResultBean> listPage3(@RequestBody PagerQuery pagerQuery); } diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportQuery.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportQuery.java index 8301a602ed..d16f85f4bd 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportQuery.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportQuery.java @@ -14,9 +14,9 @@ public class DailyReportQuery implements Query { private static final long serialVersionUID = -3990941897379861702L; @ApiModelProperty("生成日期开始") - private String createTimeStart; + private String startTime; @ApiModelProperty("生成日期结束") - private String createTimeEnd; + private String endTime; private String orgPath; } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java index 1535a4b0a3..b573427776 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java @@ -30,9 +30,9 @@ public class DailyReportService extends MybatisBaseService qw = new QueryWrapper<>(); if (query != null) { //生成日期开始时间 - String createTimeStart = query.getCreateTimeStart(); + String createTimeStart = query.getStartTime(); //生成日期结束时间 - String createTimeEnd = query.getCreateTimeEnd(); + String createTimeEnd = query.getEndTime(); qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createTimeStart + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createTimeEnd + "','%Y-%m-%d')" ); @@ -52,9 +52,9 @@ public class DailyReportService extends MybatisBaseService qw = new QueryWrapper<>(); if (query != null) { //生成日期开始时间 - String createTimeStart = query.getCreateTimeStart(); + String createTimeStart = query.getStartTime(); //生成日期结束时间 - String createTimeEnd = query.getCreateTimeEnd(); + String createTimeEnd = query.getEndTime(); qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createTimeStart + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createTimeEnd + "','%Y-%m-%d')" ); @@ -75,9 +75,9 @@ public class DailyReportService extends MybatisBaseService qw = new QueryWrapper<>(); if (query != null) { //生成日期开始时间 - String createTimeStart = query.getCreateTimeStart(); + String createTimeStart = query.getStartTime(); //生成日期结束时间 - String createTimeEnd = query.getCreateTimeEnd(); + String createTimeEnd = query.getEndTime(); qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createTimeStart + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createTimeEnd + "','%Y-%m-%d')" ); diff --git a/doc/databases/报表中心.sql b/doc/databases/报表中心.sql new file mode 100644 index 0000000000..0c2e58713a --- /dev/null +++ b/doc/databases/报表中心.sql @@ -0,0 +1,113 @@ +-- 更新库存-排产-未定 +UPDATE daily_report r + INNER JOIN ( + select sum(v.scount) as scount, v.useOrgSid, v.modelSid, v.modelConfigSid + from ( + select bo.platformNo as scount, si.useOrgSid, si.modelSid, si.configSid modelConfigSid + from anrui_base.bus_vehicle_order bo + left join anrui_scm.scm_apply_inbound si on bo.purchaseRequisitionSid = si.vehicleOrderSid + where si.nodeState != '已办结' + and bo.isDelete <> 1 + and LENGTH(offlineDate) > 0 + and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo) + union all + select bo.platformNo as scount, bo.useOrgSid, bd.vehicleSid modelSid, bd.configSid modelConfigSid + from anrui_base.bus_vehicle_order bo + left join anrui_base.bus_vehicle_apply_detail bd on bd.sid = bo.purchaseApplyMediumModelSid + where LENGTH(offlineDate) < 1 + and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)) as v + GROUP BY v.`useOrgSid`, + v.`modelSid`, + v.`modelConfigSid` + ) AS s ON r.useOrgSid = s.useOrgSid + AND r.vehModelSid = s.modelSid + AND r.vehMConfigSid = s.modelConfigSid +SET r.`pcOrder_unreserve` = s.scount +WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); + +-- 更新库存-排产已定 + +UPDATE daily_report r + INNER JOIN ( + select sum(v.scount) as scount, v.useOrgSid, v.modelSid, v.modelConfigSid + from ( + select bo.platformNo as scount, si.useOrgSid, si.modelSid, si.configSid modelConfigSid + from anrui_base.bus_vehicle_order bo + left join anrui_scm.scm_apply_inbound si on bo.purchaseRequisitionSid = si.vehicleOrderSid + where si.nodeState != '已办结' + and bo.isDelete <> 1 + and LENGTH(offlineDate) > 0 + and bo.sid in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo) + union all + select bo.platformNo as scount, bo.useOrgSid, bd.vehicleSid modelSid, bd.configSid modelConfigSid + from anrui_base.bus_vehicle_order bo + left join anrui_base.bus_vehicle_apply_detail bd on bd.sid = bo.purchaseApplyMediumModelSid + where LENGTH(offlineDate) < 1 + and bo.sid in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)) as v + GROUP BY v.`useOrgSid`, + v.`modelSid`, + v.`modelConfigSid` + ) AS s ON r.useOrgSid = s.useOrgSid + AND r.vehModelSid = s.modelSid + AND r.vehMConfigSid = s.modelConfigSid +SET r.`pcOrder_unreserve` = s.scount +WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); + +-- 更新库存- 排产小计 + +UPDATE daily_report r + INNER JOIN ( + select sum(v.scount) as scount, v.useOrgSid, v.modelSid, v.modelConfigSid + from ( + select bo.platformNo as scount, si.useOrgSid, si.modelSid, si.configSid modelConfigSid + from anrui_base.bus_vehicle_order bo + left join anrui_scm.scm_apply_inbound si on bo.purchaseRequisitionSid = si.vehicleOrderSid + where si.nodeState != '已办结' + and bo.isDelete <> 1 + and LENGTH(offlineDate) > 0 + union all + select bo.platformNo as scount, bo.useOrgSid, bd.vehicleSid modelSid, bd.configSid modelConfigSid + from anrui_base.bus_vehicle_order bo + left join anrui_base.bus_vehicle_apply_detail bd on bd.sid = bo.purchaseApplyMediumModelSid + where LENGTH(offlineDate) < 1) as v + GROUP BY v.`useOrgSid`, + v.`modelSid`, + v.`modelConfigSid` + ) AS s ON r.useOrgSid = s.useOrgSid + AND r.vehModelSid = s.modelSid + AND r.vehMConfigSid = s.modelConfigSid +SET r.`pcOrder_unreserve` = s.scount +WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); + +-- 简易订单-每日 + +UPDATE daily_report r + INNER JOIN (select count(bbv.id) as scount, bbv.modelSid, bbv.modelConfigSid, bbm.orgSid useOrgSid + from anrui_buscenter.bus_main_deposit bbm + left join anrui_buscenter.bus_deposit_vehicle bbv on bbv.billSid = bbm.sid + where bbm.createTime 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.`simpleOrder_day` = s.scount +WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); + + +-- 简易订单-每月 + +UPDATE daily_report r + INNER JOIN (select count(bbv.id) as scount, bbv.modelSid, bbv.modelConfigSid, bbm.orgSid useOrgSid + from anrui_buscenter.bus_main_deposit bbm + left join anrui_buscenter.bus_deposit_vehicle bbv on bbv.billSid = bbm.sid + where bbm.createTime 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.`simpleOrder_month` = s.scount +WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); \ No newline at end of file