yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

销售车辆交付情况

master
dimengzhe 2 years ago
parent
8ce463d370
commit
b3b5302b2e
3 changed files with 34 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicle/BusSalesVehicleExportVo.java
  2. 14
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicle/BusSalesVehicleVo.java
  3. 31
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleMapper.xml

14
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicle/BusSalesVehicleExportVo.java
View File

@ -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;
}

14
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicle/BusSalesVehicleVo.java
View File

@ -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;
}

31
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleMapper.xml
View File

@ -3,25 +3,34 @@
<mapper namespace="com.yxt.anrui.buscenter.biz.bussalesvehicle.BusSalesVehicleMapper">
<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesvehicle.BusSalesVehicleVo">
select bv.useOrgName,
bvoa.orgName deptName,
bvoa.orgName deptName,
bvoa.staffName,
bvoa.customerName,
bvoa.contractNo,
bv.modelName,
bv.vinNo,
bvoa.saleTypeValue saleType,
bvoa.saleDate,
if(length(bh.closingDate) > 0, '已交付', '未交付') as handoverState,
bh.closingDate as handoverDate
bvoa.saleTypeValue saleType,
DATE_FORMAT(bvoa.saleDate, '%Y-%m-%d') as saleDate,
if(length(bh.closingDate) > 0, '已交付', '未交付')
as handoverState,
DATE_FORMAT(bh.closingDate, '%Y-%m-%d') as handoverDate
from 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
left join anrui_buscenter.bus_handover bh on bh.sid = bi.handoverSid
<where>
${ew.sqlSegment}
and length(bv.salesDate) > 0
and length
(
bv
.
salesDate
)
>
0
<if test="state != null and state != ''">
<if test="state == '已交付'">
and length(bh.closingDate)
@ -33,6 +42,7 @@
</if>
</if>
</where>
order by bv.useOrgName desc,bvoa.orgName desc,bvoa.staffName desc,bvoa.customerName desc,bvoa.contractNo desc
</select>
@ -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

Write Preview
Loading…
Cancel
Save