diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicle/BusSalesVehicleExportVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicle/BusSalesVehicleExportVo.java index 7ea28a36f2..97f0a389e2 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicle/BusSalesVehicleExportVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicle/BusSalesVehicleExportVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.buscenter.api.bussalesvehicle; +import com.yxt.common.core.utils.ExportEntityMap; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,26 +13,39 @@ import lombok.Data; @Data public class BusSalesVehicleExportVo { + @ExportEntityMap(CnName = "序号", EnName = "rankNo") + private Integer rankNo; @ApiModelProperty("分公司") + @ExportEntityMap(CnName = "分公司", EnName = "useOrgName") private String useOrgName; @ApiModelProperty("部门") + @ExportEntityMap(CnName = "部门", EnName = "deptName") private String deptName; @ApiModelProperty("销售专员") + @ExportEntityMap(CnName = "销售专员", EnName = "staffName") private String staffName; @ApiModelProperty("客户") + @ExportEntityMap(CnName = "客户", EnName = "customerName") private String customerName; @ApiModelProperty("合同编号") + @ExportEntityMap(CnName = "合同编号", EnName = "contractNo") private String contractNo; @ApiModelProperty("车型") + @ExportEntityMap(CnName = "车型", EnName = "modelName") private String modelName; @ApiModelProperty("车架号") + @ExportEntityMap(CnName = "车架号", EnName = "vinNo") private String vinNo; @ApiModelProperty("销售类型") + @ExportEntityMap(CnName = "销售类型", EnName = "saleType") private String saleType; @ApiModelProperty("销售日期") + @ExportEntityMap(CnName = "销售日期", EnName = "saleDate") private String saleDate; @ApiModelProperty("交付状态") + @ExportEntityMap(CnName = "交付状态", EnName = "handoverState") private String handoverState; @ApiModelProperty("交付日期") + @ExportEntityMap(CnName = "交付日期", EnName = "handoverDate") private String handoverDate; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicle/BusSalesVehicleVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicle/BusSalesVehicleVo.java index 8542bd7cdc..1eca31dbf6 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicle/BusSalesVehicleVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicle/BusSalesVehicleVo.java @@ -12,41 +12,27 @@ import lombok.Data; @Data public class BusSalesVehicleVo { - @ExportEntityMap(CnName = "序号", EnName = "rankNo") - private Integer rankNo; - @ApiModelProperty("分公司") - @ExportEntityMap(CnName = "分公司", EnName = "useOrgName") private String useOrgName; @ApiModelProperty("部门") - @ExportEntityMap(CnName = "部门", EnName = "deptName") private String deptName; @ApiModelProperty("销售专员") - @ExportEntityMap(CnName = "销售专员", EnName = "staffName") private String staffName; @ApiModelProperty("客户") - @ExportEntityMap(CnName = "客户", EnName = "customerName") private String customerName; @ApiModelProperty("合同编号") - @ExportEntityMap(CnName = "合同编号", EnName = "contractNo") private String contractNo; @ApiModelProperty("车型") - @ExportEntityMap(CnName = "车型", EnName = "modelName") private String modelName; @ApiModelProperty("车架号") - @ExportEntityMap(CnName = "车架号", EnName = "vinNo") private String vinNo; @ApiModelProperty("销售类型") - @ExportEntityMap(CnName = "销售类型", EnName = "saleType") private String saleType; @ApiModelProperty("销售日期") - @ExportEntityMap(CnName = "销售日期", EnName = "saleDate") private String saleDate; @ApiModelProperty("交付状态") - @ExportEntityMap(CnName = "交付状态", EnName = "handoverState") private String handoverState; @ApiModelProperty("交付日期") - @ExportEntityMap(CnName = "交付日期", EnName = "handoverDate") private String handoverDate; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleMapper.xml index 4b3bc3cb11..335d0cf494 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleMapper.xml @@ -3,25 +3,34 @@ @@ -47,11 +57,10 @@ bvoa.saleTypeValue saleType, bvoa.saleDate, if(length(bh.closingDate) > 0, '已交付', '未交付') as handoverState, - bh.closingDate as handoverDate, - - (@rank := @rank + 1) rankNo - from anrui_base.base_vehicle_out bvo, - (SELECT @rank := 0) t + DATE_FORMAT(bh.closingDate, '%Y-%m-%d') as handoverDate, + (@rank := @rank + 1) rankNo + from (SELECT @rank := 0) t, + anrui_base.base_vehicle_out bvo left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid left join anrui_base.base_vehicle bv on bvo.vinSid = bv.sid left join anrui_buscenter.bus_handover_items bi on bi.vinSid = bv.sid