Browse Source

报表中心

master
dimengzhe 1 year ago
parent
commit
87271d72a0
  1. 14
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportAppPagerQuery.java
  2. 37
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportAppPagerVo.java
  3. 15
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java
  4. 110
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/ReportVo.java
  5. 10
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.java
  6. 125
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
  7. 12
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportRest.java
  8. 66
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java
  9. 17
      doc/databases/报表中心.sql

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

@ -0,0 +1,14 @@
package com.yxt.anrui.reportcenter.api.dailyreport;
import com.yxt.common.core.query.Query;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2023/12/7
**/
@Data
public class DailyReportAppPagerQuery implements Query {
private static final long serialVersionUID = 1122320253221250027L;
}

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

@ -0,0 +1,37 @@
package com.yxt.anrui.reportcenter.api.dailyreport;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2023/12/7
**/
@Data
public class DailyReportAppPagerVo {
@ApiModelProperty("日期")
private String date;
//存销比
@ApiModelProperty("存销比")
private String saleOfStockRatio;
//库存小计
@ApiModelProperty("库存小计")
private int stock_subtotal;
@ApiModelProperty("排产小计")
private int pcOrder_subtotal;
@ApiModelProperty("本日销售订单")
private int saleOrder_subtotal_day;
@ApiModelProperty("本日销售")
private int sale_subtotal_day;
@ApiModelProperty("欠款出库金额")
private int arrears_carry_veh_amount;
@ApiModelProperty("金融未放款金额")
private int loan_not_amount;
@ApiModelProperty("本日买断")
private int buyout_day;
private String useOrgSid;
}

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

@ -33,12 +33,13 @@ public interface DailyReportFeign {
/**
* 获取动态列
*
* @param useOrgSid
* @return
*/
@GetMapping("selectListByUseOrgSid")
@ResponseBody
ResultBean<List<DailyParameterVo>> selectListByUseOrgSid(@RequestParam("useOrgSid")String useOrgSid);
ResultBean<List<DailyParameterVo>> selectListByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid);
/**
* 按照生成日期
@ -73,9 +74,19 @@ public interface DailyReportFeign {
@ResponseBody
ResultBean<PagerVo<DailyReportListVo>> listPage_1(@RequestBody PagerQuery<DailyReportQuery> pagerQuery);
@ApiOperation("移动端事业部")
@ApiOperation("移动端事业部日报表")
@PostMapping("list1")
@ResponseBody
ResultBean<DailyReportAppVo> list1(@RequestBody ListQuery query);
@ApiOperation("移动端集团列表")
@PostMapping("pageList1")
@ResponseBody
ResultBean<PagerVo<DailyReportAppPagerVo>> pageList1(@RequestBody PagerQuery<DailyReportAppPagerQuery> pagerQuery);
@ApiOperation("集团日期初始化")
@GetMapping("getReport")
@ResponseBody
ResultBean<ReportVo> getReport(@RequestParam("date")String date);
}

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

@ -0,0 +1,110 @@
package com.yxt.anrui.reportcenter.api.dailyreport;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2023/12/7
**/
@Data
public class ReportVo implements Vo {
private static final long serialVersionUID = 7906138153156271043L;
@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 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 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;
}

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

@ -21,7 +21,7 @@ import java.util.List;
public interface DailyReportMapper extends BaseMapper<DailyReport> {
IPage<DailyReportVo> listPage(IPage<DailyReport> page, @Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
IPage<DailyReportVo> listPage3(IPage<DailyReport> page, @Param(Constants.WRAPPER)QueryWrapper<DailyReport> qw);
IPage<DailyReportVo> listPage3(IPage<DailyReport> page, @Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
List<DailyParameterVo> selectByParameters(String useOrgSid);
@ -29,7 +29,7 @@ public interface DailyReportMapper extends BaseMapper<DailyReport> {
BaseModelConfig selectConfig(String configSid);
IPage<DailyReportListVo> listPage3_1(IPage<DailyReport> page, @Param(Constants.WRAPPER)QueryWrapper<DailyReport> qw);
IPage<DailyReportListVo> listPage3_1(IPage<DailyReport> page, @Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
String select(@Param("useOrgSid") String useOrgSid, @Param("brandSid") String brandSid, @Param("vehModelSid") String vehModelSid, @Param("vehMConfigSid") String vehMConfigSid, @Param("createTime") String createTime);
@ -39,7 +39,11 @@ public interface DailyReportMapper extends BaseMapper<DailyReport> {
String select3(@Param("busOrgSid") String busOrgSid, @Param("brandSid") String brandSid, @Param("vehModelSid") String vehModelSid, @Param("vehMConfigSid") String vehMConfigSid, @Param("createTime") String createTime);
List<BrandVo> selectByBrand(@Param("sybOrgSid") String sybOrgSid,@Param("queryTime")String queryTime);
List<BrandVo> selectByBrand(@Param("sybOrgSid") String sybOrgSid, @Param("queryTime") String queryTime);
List<DailyReportVo> selectReport(@Param("join") List<String> brandList, @Param("sybOrgSid") String sybOrgSid, @Param("queryTime") String queryTime);
IPage<DailyReportListVo> pageList1(IPage<DailyReport> page, @Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
ReportVo getReport(@Param(Constants.WRAPPER) QueryWrapper<DailyReport> qw);
}

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

@ -119,7 +119,56 @@
</select>
<select id="selectReport" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo">
select dr.*,bm.fuelTypeValue,bm.emissionStandardValue
select ifnull(dr.saleOfStockRatio, 0) as saleOfStockRatio,
ifnull(dr.stock_total, 0) as stock_total,
ifnull(dr.stock_unreserve, 0) as stock_unreserve,
ifnull(dr.stock_reserve, 0) as stock_reserve,
ifnull(dr.stock_subtotal, 0) as stock_subtotal,
ifnull(dr.stock_buyout_unreserve, 0) as stock_buyout_unreserve,
ifnull(dr.stock_buyout_reserve, 0) as stock_buyout_reserve,
ifnull(dr.stock_buyout_subtotal, 0) as stock_buyout_subtotal,
ifnull(dr.pcOrder_unreserve, 0) as pcOrder_unreserve,
ifnull(dr.pcOrder_reserve, 0) as pcOrder_reserve,
ifnull(dr.pcOrder_subtotal, 0) as pcOrder_subtotal,
ifnull(dr.simpleOrder_day, 0) as simpleOrder_day,
ifnull(dr.simpleOrder_month, 0) as simpleOrder_month,
ifnull(dr.saleOrder_full_day, 0) as saleOrder_full_day,
ifnull(dr.saleOrder_loan_day, 0) as saleOrder_loan_day,
ifnull(dr.saleOrder_subtotal_day, 0) as saleOrder_subtotal_day,
ifnull(dr.saleOrder_full_month, 0) as saleOrder_full_month,
ifnull(dr.saleOrder_loan_month, 0) as saleOrder_loan_month,
ifnull(dr.saleOrder_subtotal_month, 0) as saleOrder_subtotal_month,
ifnull(dr.saleOrder_waitVeh_total, 0) as saleOrder_waitVeh_total,
ifnull(dr.sale_full_day, 0) as sale_full_day,
ifnull(dr.sale_loan_day, 0) as sale_loan_day,
ifnull(dr.sale_subtotal_day, 0) as sale_subtotal_day,
ifnull(dr.sale_full_month, 0) as sale_full_month,
ifnull(dr.sale_loan_month, 0) as sale_loan_month,
ifnull(dr.sale_subtotal_month, 0) as sale_subtotal_month,
ifnull(dr.sale_full_year, 0) as sale_full_year,
ifnull(dr.sale_loan_year, 0) as sale_loan_year,
ifnull(dr.sale_subtotal_year, 0) as sale_subtotal_year,
ifnull(dr.manufacturer_invoicing_year, 0) as manufacturer_invoicing_year,
ifnull(dr.buyout_day, 0) as buyout_day,
ifnull(dr.buyout_month, 0) as buyout_month,
ifnull(dr.buyout_year, 0) as buyout_year,
ifnull(dr.arrears_carry_veh_count, 0) as arrears_carry_veh_count,
ifnull(dr.arrears_carry_veh_amount, 0) as arrears_carry_veh_amount,
ifnull(dr.loan_not_count, 0) as loan_not_count,
ifnull(dr.loan_not_amount, 0) as deliver_loan_day,
dr.remarks,
ifnull(dr.deliver_loan_day, 0) as deliver_loan_day,
ifnull(dr.deliver_full_day, 0) as deliver_full_day,
ifnull(dr.deliver_subtotal_day, 0) as deliver_subtotal_day,
ifnull(dr.deliver_loan_month, 0) as deliver_loan_month,
ifnull(dr.deliver_full_month, 0) as deliver_full_month,
ifnull(dr.deliver_subtotal_month, 0) as deliver_subtotal_month,
ifnull(dr.deliver_loan_year, 0) as deliver_loan_year,
ifnull(dr.deliver_full_year, 0) as deliver_full_year,
ifnull(dr.deliver_subtotal_year, 0) as deliver_subtotal_year
,
bm.fuelTypeValue,
bm.emissionStandardValue
from daily_report dr
left join anrui_base.base_vehicle_model bm on bm.sid = dr.vehModelSid
left join anrui_base.base_model_config bmc on bmc.sid = dr.vehMConfigSid
@ -132,4 +181,78 @@
<!-- group by dr.busOrgSid, dr.brandSid, dr.vehModelSid, dr.vehMConfigSid-->
order by dr.brandSid desc
</select>
<select id="pageList1" resultType="com.yxt.anrui.reportcenter.api.dailyreport.DailyReportListVo">
select DATE_FORMAT(createTime, '%Y-%m-%d') as date,
sum(saleOfStockRatio) as saleOfStockRatio,
sum(stock_subtotal) as stock_subtotal,
sum(pcOrder_subtotal) as pcOrder_subtotal,
sum(saleOrder_subtotal_day) as saleOrder_subtotal_day,
sum(sale_subtotal_day) as sale_subtotal_day,
sum(arrears_carry_veh_amount) as arrears_carry_veh_amount,
sum(loan_not_amount) as loan_not_amount,
sum(buyout_day) as buyout_day,
useOrgSid
from daily_report
<where>
${ew.sqlSegment}
</where>
group by DATE_FORMAT(createTime, '%Y-%m-%d')
order by DATE_FORMAT(createTime, '%Y-%m-%d') desc
</select>
<select id="getReport" resultType="com.yxt.anrui.reportcenter.api.dailyreport.ReportVo">
select DATE_FORMAT(createTime, '%Y-%m-%d') as date,
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>
${ew.sqlSegment}
</where>
</select>
</mapper>

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

@ -75,4 +75,16 @@ public class DailyReportRest implements DailyReportFeign {
public ResultBean<DailyReportAppVo> list1(ListQuery query) {
return dailyReportService.list1(query);
}
@Override
public ResultBean<PagerVo<DailyReportAppPagerVo>> pageList1(PagerQuery<DailyReportAppPagerQuery> pagerQuery) {
ResultBean rb = ResultBean.fireFail();
PagerVo<DailyReportAppPagerVo> pv = dailyReportService.pageList1(pagerQuery);
return rb.success().setData(pv);
}
@Override
public ResultBean<ReportVo> getReport(String date) {
return dailyReportService.getReport(date);
}
}

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

@ -309,7 +309,10 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
String sybOrgSid = "";
if (StringUtils.isNotBlank(query.getOrgPath())) {
List<String> stringList = Arrays.asList(query.getOrgPath().split("/"));
sybOrgSid = query.getOrgPath().substring(37, 73);
if(stringList.size()>=2){
sybOrgSid = query.getOrgPath().substring(37, 73);
}
}
if (StringUtils.isNotBlank(sybOrgSid)) {
List<BrandVo> rows1 = baseMapper.selectByBrand(sybOrgSid, query.getQueryTime());
@ -324,56 +327,95 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
List<String> row3 = dailyReportVoList.stream().map(v -> v.getEmissionStandardValue()).collect(Collectors.toList());
dailyReportAppVo.setRow3(row3);
//存销比
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());
@ -449,4 +491,26 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
return rb.success().setData(dailyReportAppVo);
}
public PagerVo<DailyReportAppPagerVo> pageList1(PagerQuery<DailyReportAppPagerQuery> pagerQuery) {
DailyReportAppPagerQuery query = pagerQuery.getParams();
QueryWrapper<DailyReport> qw = new QueryWrapper<>();
if (query != null) {
}
IPage<DailyReport> page = PagerUtil.queryToPage(pagerQuery);
IPage<DailyReportListVo> pagging = baseMapper.pageList1(page, qw);
PagerVo<DailyReportAppPagerVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean<ReportVo> getReport(String date) {
ResultBean<ReportVo> rb = ResultBean.fireFail();
QueryWrapper<DailyReport> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(date)) {
qw.like("createTime", date);
}
ReportVo reportVo = baseMapper.getReport(qw);
return rb.success().setData(reportVo);
}
}

17
doc/databases/报表中心.sql

@ -525,6 +525,23 @@ set deliver_subtotal_year = s.scount
where DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
-- 存销比
update daily_report r inner join (
select ifnull(sum(dr.sale_subtotal_month), 0) as subtotal,dr.useOrgSid,dr.vehModelSid,dr.vehMConfigSid
from daily_report dr
where
(DATE_FORMAT(createTime, '%Y-%m') LIKE DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')
OR DATE_FORMAT(createTime, '%Y-%m') LIKE DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 2 MONTH), '%Y-%m')
OR DATE_FORMAT(createTime, '%Y-%m') LIKE DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 3 MONTH), '%Y-%m')
) group by dr.useOrgSid, dr.vehModelSid, dr.vehMConfigSid) s
on r.useOrgSid = s.useOrgSid
and r.vehModelSid = s.vehModelSid
and r.vehMConfigSid = s.vehMConfigSid
set saleOfStockRatio =if(s.subtotal= 0,stock_subtotal+pcOrder_subtotal,ROUND((stock_subtotal+pcOrder_subtotal)/ROUND(s.subtotal/3,2),2)) ,
stock_total = (stock_subtotal+pcOrder_subtotal)
where DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();

Loading…
Cancel
Save