From 6d3e1cad88569da0d5f637b2a17918729699008f Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 30 Mar 2023 16:02:27 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../riskcenter/biz/loansolutions/LoanSolutionsService.java | 2 ++ .../terminal/api/risk/solutions/AppSolutionsDetailsVo.java | 1 + .../yxt/anrui/terminal/api/risk/solutions/AppSolutionsDto.java | 2 ++ 3 files changed, 5 insertions(+) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index 76ee37b310..619066c1c5 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -492,6 +492,8 @@ public class LoanSolutionsService extends MybatisBaseService Date: Thu, 30 Mar 2023 16:30:40 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buscenter/biz/bussalesorder/BusSalesOrderService.java | 2 +- .../api/loansolutionsdetail/LoanSolutionsDetail.java | 2 +- .../riskcenter/biz/loansolutions/LoanSolutionsService.java | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 127644f4af..ec915028fc 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -4169,7 +4169,7 @@ public class BusSalesOrderService extends MybatisBaseService vinList = appOrderModelInfoVo.getVinListsVos(); for (int i = 0; i < vinList.size(); i++) { UnCollectionDto unCollectionDto = new UnCollectionDto(); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetail.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetail.java index 9154cc11cd..92e67ed9df 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetail.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetail.java @@ -30,7 +30,7 @@ public class LoanSolutionsDetail extends BaseEntity { @ApiModelProperty("主产品方案sid") private String solutionsSid; @ApiModelProperty("融资首付") - private BigDecimal downPayAmount; + private BigDecimal downPayAmounts; @ApiModelProperty("贷款保证金") private BigDecimal bondAmounts; @ApiModelProperty("保险保证金") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index 619066c1c5..1e35f5fcfe 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -342,6 +342,7 @@ public class LoanSolutionsService extends MybatisBaseService Date: Thu, 30 Mar 2023 16:55:38 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../loansolutions/LoanSolutionsService.java | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index 1e35f5fcfe..140c5bc268 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -92,10 +92,20 @@ public class LoanSolutionsService extends MybatisBaseService Date: Thu, 30 Mar 2023 17:25:47 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../riskcenter/biz/loansolutions/LoanSolutionsService.java | 6 +++--- .../terminal/api/risk/solutions/AppSolutionsDetailsVo.java | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index 140c5bc268..f09dfbdacb 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -201,7 +201,7 @@ public class LoanSolutionsService extends MybatisBaseService Date: Thu, 30 Mar 2023 17:43:45 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=8F=B0=E8=B4=A6--?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/cheliang/basevehicle.js | 8 ++-- .../cheliangtaizhang/cheliangtaizhang.vue | 37 +++++++++++-------- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js b/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js index 09a1f06811..3b010e2d01 100644 --- a/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js +++ b/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js @@ -58,12 +58,10 @@ export function details(data) { export function basefinbankExportExcel(data) { return request({ url: '/base/v1/basevehicle/exportExcel', - data, - method: 'get', + method: 'post', responseType: 'blob', // 表明返回服务器返回的数据类型 - headers: { - 'Content-Type': 'application/json' - } + data: data, + headers: { 'Content-Type': 'application/json' } }) } diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue index eb0e04096f..7d16bf88a6 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue @@ -535,7 +535,7 @@ export default { type: 'success', size: 'small', icon: 'export', - btnKey: 'build', + btnKey: 'doExport', btnLabel: '导出' }, { @@ -1296,23 +1296,28 @@ export default { }, // 导出 doExport() { - // this.$confirm('确定要导出数据, 是否继续?', '提示', { - // confirmButtonText: '确定', - // cancelButtonText: '取消', - // type: 'warning' - // }) - basefinbankExportExcel(this.sids).then((res) => { - const blob = new Blob([res], { + const loading = this.$loading({ + lock: true, + text: 'Loading', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) + basefinbankExportExcel(this.listQuery.params).then((resp) => { + loading.close() + const blob = new Blob([resp], { type: 'application/vnd.ms-excel' }) - const objectUrl = URL.createObjectURL(blob) - window.location.href = objectUrl - this.$notify({ - title: '提示', - message: '导出成功', - type: 'success', - duration: 2000 - }) + const fileName = '车辆台账表' + '.xls' + const elink = document.createElement('a') + elink.download = fileName + elink.style.display = 'nonde' + elink.href = URL.createObjectURL(blob) + document.body.appendChild(elink) + elink.click() + URL.revokeObjectURL(elink.href) + document.body.removeChild(elink) + }).catch(() => { + loading.close() }) }, doClose() { From a88d76fcde4d64e4c3b42301abe2a8b7538f8260 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 30 Mar 2023 17:44:45 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java | 2 +- .../riskcenter/api/loansolutions/app/SolutionsDetailsVo.java | 3 +++ .../riskcenter/biz/loansolutions/LoanSolutionsService.java | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java index edde98c9cb..3f682df177 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java @@ -39,7 +39,7 @@ public interface LoanSolutionsFeign { @ApiOperation("根据销售订单sid查询金融方案") @GetMapping("/selectDetailss") - ResultBean selectDetailss(String businessSid); + ResultBean selectDetailss(@RequestParam("businessSid") String businessSid); @ApiOperation("删除该销售订单的金融方案") @DeleteMapping("/deleteByOrderSid") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java index 1c4f4c6f87..1229b7651d 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java @@ -16,6 +16,9 @@ public class SolutionsDetailsVo implements Vo { @ApiModelProperty("是否是三方金融") private boolean finPlanState; + @ApiModelProperty("销售订单sid") + private String salesOrderSid; + //金融方案主表 @ApiModelProperty("类型：01自营非担保，02外部金融") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index f09dfbdacb..253049b273 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -90,6 +90,9 @@ public class LoanSolutionsService extends MybatisBaseService Date: Thu, 30 Mar 2023 17:51:37 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicle/BaseVehicleExportQuery.java | 126 +++++++++++- .../api/basevehicle/BaseVehicleExportVo.java | 194 +++++++++++++++--- .../api/basevehicle/BaseVehicleFeign.java | 24 ++- .../biz/basevehicle/BaseVehicleMapper.java | 3 + .../biz/basevehicle/BaseVehicleMapper.xml | 108 ++++++++++ .../base/biz/basevehicle/BaseVehicleRest.java | 119 ++++++++--- .../biz/basevehicle/BaseVehicleService.java | 177 ++++++++++++++-- 7 files changed, 683 insertions(+), 68 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java index 06726143c0..160fe0d345 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java @@ -21,12 +21,136 @@ public class BaseVehicleExportQuery implements Query { @ApiModelProperty(value = "sids", required = false) private List sids; + // @ApiModelProperty(value = "车架号") +// private String vinNo; +// @ApiModelProperty(value = "车型名称") +// private String modelName; +// @ApiModelProperty(value = "存放地点") +// private String location; +// @ApiModelProperty(value = "车辆状态") +// private String vehicleState; + + @ApiModelProperty(value = "厂家采购订单类型value") + private String manPurOrderTypeValue; + @ApiModelProperty(value = "厂家库龄") + private Long libraryAge; + @ApiModelProperty(value = "公司库龄") + private Long orgLibraryAge; + @ApiModelProperty(value = "买断库龄") + private Long settlementLibraryAge; + @ApiModelProperty(value = "分公司sid") + private String orgSid; + @ApiModelProperty(value = "创建组织sid") + private String createOrgSid; + @ApiModelProperty(value = "组织全路径") + private String orgSidPath; @ApiModelProperty(value = "车架号") private String vinNo; @ApiModelProperty(value = "车型名称") private String modelName; @ApiModelProperty(value = "存放地点") private String location; - @ApiModelProperty(value = "车辆状态") + @ApiModelProperty(value = "库存状态") private String vehicleState; + @ApiModelProperty(value = "合格证状态value") + private String certificateStateValue; + + @ApiModelProperty(value = "内部编码") + private String insideCode; + @ApiModelProperty(value = "采购类型") + private String manPurOrderTypeKey; + @ApiModelProperty(value = "厂家入库日期") + private String priceDate; + @ApiModelProperty(value = "买断状态") + private String settlementStatus; + + @ApiModelProperty(value = "销售开始日期") + private String salesStartDate; + @ApiModelProperty(value = "销售结束日期") + private String salesEndDate; + + @ApiModelProperty(value = "买断开始日期") + private String solidStartDate; + @ApiModelProperty(value = "买断结束日期") + private String solidEndDate; + + + /***************车型查询**********************/ + + @ApiModelProperty(value = "品牌") + private String carBrand; + @ApiModelProperty(value = "功能") + private String vehicleType; + @ApiModelProperty(value = "系列") + private String productLine; + @ApiModelProperty(value = "驱动") + private String driveForm; + @ApiModelProperty(value = "马力") + private String power; + @ApiModelProperty(value = "版本") + private String vehicleVersion; + @ApiModelProperty(value = "燃料") + private String fuelType; + @ApiModelProperty(value = "车型编码") + private String vehicleTypeCode; + @ApiModelProperty(value = "变速箱") + private String gearboxType; + @ApiModelProperty(value = "变速箱类型key") + private String tranCaseTypeKey; + @ApiModelProperty(value = "排放标准") + private String emissionStandard; + @ApiModelProperty(value = "发动机型号") + private String engineType; + @ApiModelProperty(value = "细分市场") + private String marketSegments; + @ApiModelProperty(value = "规格型号") + private String specifications; + + /***************车型配置查询*******************/ + + @ApiModelProperty(value = "颜色") + private String carColorKey; + @ApiModelProperty(value = "缓速器") + private String slowMachineKey; + @ApiModelProperty(value = "后视镜") + private String rearViewMirrorKey; + // @ApiModelProperty(value = "轮胎") +// private String driveForm; + @ApiModelProperty(value = "驾驶室") + private String specificationKey; + @ApiModelProperty(value = "后桥") + private String rearAxleKey; + @ApiModelProperty(value = "速比") + private String rearAxleRatioKey; + @ApiModelProperty(value = "空调") + private String airConditionerKey; + @ApiModelProperty(value = "轮毂材质") + private String hubMaterialKey; + @ApiModelProperty(value = "导流罩") + private String baffleModelKey; + @ApiModelProperty(value = "悬架") + private String suspensionKey; + @ApiModelProperty(value = "座椅") + private String seatKey; + @ApiModelProperty(value = "护轮罩") + private String tireCoverKey; + @ApiModelProperty(value = "鞍座") + private String saddleKey; + @ApiModelProperty(value = "轴距") + private String wheelbaseKey; + @ApiModelProperty(value = "保险杠") + private String bumperKey; + @ApiModelProperty(value = "配置包") + private String configuringBaoKey; + @ApiModelProperty(value = "独立热源") + private String independentSourcesKey; + @ApiModelProperty(value = "燃料箱") + private String fuelTankKey; + @ApiModelProperty(value = "多媒体") + private String multimediaKey; + @ApiModelProperty(value = "常用配置名称") + private String configName; + @ApiModelProperty("配置编码") + private String configCode; + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportVo.java index 0cb9075caa..241157369b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportVo.java @@ -1,9 +1,12 @@ package com.yxt.anrui.base.api.basevehicle; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.utils.ExportEntityMap; import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; + /** * @author dimengzhe * @date 2021/9/30 16:25 @@ -13,30 +16,175 @@ import lombok.Data; public class BaseVehicleExportVo implements Vo { private static final long serialVersionUID = -1722170460354213687L; - @ExportEntityMap(CnName = "车型名称", EnName = "modelName") - private String modelName; - - @ExportEntityMap(CnName = "配置编码", EnName = "vehicleCode") - private String vehicleCode; + // @ExportEntityMap(CnName = "车型名称", EnName = "modelName") +// private String modelName; +// +// @ExportEntityMap(CnName = "配置编码", EnName = "vehicleCode") +// private String vehicleCode; +// +// @ExportEntityMap(CnName = "车架号", EnName = "vinNo") +// private String vinNo; +// +// @ExportEntityMap(CnName = "发动机号/许可证号", EnName = "engineNo") +// private String engineNo; +// +// @ExportEntityMap(CnName = "制造日期", EnName = "manufactureDate") +// private String manufactureDate; +// +// @ExportEntityMap(CnName = "车辆状态", EnName = "vehicleState") +// private String vehicleState; +// +// @ExportEntityMap(CnName = "存放地点", EnName = "location") +// private String location; +// +// @ExportEntityMap(CnName = "首次发车日期", EnName = "firstStartDate") +// private String firstStartDate; +// +// @ExportEntityMap(CnName = "库龄", EnName = "libraryAge") +// private String libraryAge; - @ExportEntityMap(CnName = "车架号", EnName = "vinNo") + @ExportEntityMap(CnName = "序号", EnName = "rankNo") + private Integer rankNo; + @ExportEntityMap(CnName = "所属公司", EnName = "createOrgName") + private String createOrgName; // 分公司 + @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName") + private String purchaseSystemName; + @ExportEntityMap(CnName = "车型（配置简述）", EnName = "modelName") + private String modelName; + @ExportEntityMap(CnName = "厂家库龄", EnName = "libraryAge") + private Long libraryAge; + @ExportEntityMap(CnName = "公司库龄", EnName = "orgLibraryAge") + private Long orgLibraryAge; + @ExportEntityMap(CnName = "买断库龄", EnName = "settlementLibraryAge") + private Long settlementLibraryAge; + @ExportEntityMap(CnName = "17位车架号", EnName = "vinNo") private String vinNo; - - @ExportEntityMap(CnName = "发动机号/许可证号", EnName = "engineNo") + @ExportEntityMap(CnName = "后8位车架号", EnName = "lastVinNo") + private String lastVinNo; + @ExportEntityMap(CnName = "发动机号", EnName = "engineNo") private String engineNo; - - @ExportEntityMap(CnName = "制造日期", EnName = "manufactureDate") - private String manufactureDate; - - @ExportEntityMap(CnName = "车辆状态", EnName = "vehicleState") - private String vehicleState; - - @ExportEntityMap(CnName = "存放地点", EnName = "location") - private String location; - - @ExportEntityMap(CnName = "首次发车日期", EnName = "firstStartDate") - private String firstStartDate; - - @ExportEntityMap(CnName = "库龄", EnName = "libraryAge") - private String libraryAge; + @ExportEntityMap(CnName = "采购类型", EnName = "manPurOrderTypeValue") + private String manPurOrderTypeValue; + @ExportEntityMap(CnName = "排产订单编号", EnName = "orderingNo") + private String orderingNo; + @ExportEntityMap(CnName = "锁定状态", EnName = "lockedStateValue") + private String lockedStateValue; + @ExportEntityMap(CnName = "细分市场", EnName = "marketSegmentsValue") + private String marketSegmentsValue; + @ExportEntityMap(CnName = "品牌", EnName = "vehModelBrandName") + private String vehModelBrandName; + @ExportEntityMap(CnName = "功能", EnName = "vehicleTypeValue") + private String vehicleTypeValue; + @ExportEntityMap(CnName = "内部编码", EnName = "insideCode") + private String insideCode; + @ExportEntityMap(CnName = "车辆型号", EnName = "carModel") + private String carModel; + @ExportEntityMap(CnName = "系列", EnName = "productLineValue") + private String productLineValue; + @ExportEntityMap(CnName = "版本", EnName = "vehicleVersionValue") + private String vehicleVersionValue; + @ExportEntityMap(CnName = "驱动", EnName = "driveFormValue") + private String driveFormValue; + @ExportEntityMap(CnName = "排放", EnName = "emissionStandardValue") + private String emissionStandardValue; + @ExportEntityMap(CnName = "马力", EnName = "powerValue") + private String powerValue; + @ExportEntityMap(CnName = "变速箱", EnName = "gearboxTypeValue") + private String gearboxTypeValue; + @ExportEntityMap(CnName = "后桥", EnName = "rearAxleValue") + private String rearAxleValue; + @ExportEntityMap(CnName = "速比", EnName = "rearAxleRatio") + private String rearAxleRatio; + @ExportEntityMap(CnName = "轴距", EnName = "wheelbase") + private String wheelbase; + @ExportEntityMap(CnName = "悬架/板簧片数", EnName = "suspension") + private String suspension; + @ExportEntityMap(CnName = "鞍座", EnName = "saddle") + private String saddle; + @ExportEntityMap(CnName = "颜色", EnName = "carColor") + private String carColor; + @ExportEntityMap(CnName = "驾驶室", EnName = "specification") + private String specification; + @ExportEntityMap(CnName = "保险杠", EnName = "bumper") + private String bumper; + @ExportEntityMap(CnName = "油箱/气罐", EnName = "fuelTank") + private String fuelTank; + @ExportEntityMap(CnName = "导流罩", EnName = "baffleModel") + private String baffleModel; + @ExportEntityMap(CnName = "独立热源", EnName = "independentSources") + private String independentSources; + @ExportEntityMap(CnName = "液力缓速器", EnName = "slowMachine") + private String slowMachine; + @ExportEntityMap(CnName = "护轮罩", EnName = "tireCover") + private String tireCover; + @ExportEntityMap(CnName = "后视镜", EnName = "rearViewMirror") + private String rearViewMirror; + @ExportEntityMap(CnName = "轮胎", EnName = "tireSize") + private String tireSize; + @ExportEntityMap(CnName = "轮毂材质", EnName = "hubMaterial") + private String hubMaterial; + @ExportEntityMap(CnName = "独立空调", EnName = "airConditioner") + private String airConditioner; + @ExportEntityMap(CnName = "座椅", EnName = "seat") + private String seat; + @ExportEntityMap(CnName = "多媒体", EnName = "multimedia") + private String multimedia; + @ExportEntityMap(CnName = "配置包", EnName = "configuringBao") + private String configuringBao; + @ExportEntityMap(CnName = "更多配置", EnName = "otherConfig") + private String otherConfig; + @ExportEntityMap(CnName = "库存状态", EnName = "vehicleStateValue") + private String vehicleStateValue; + @ExportEntityMap(CnName = "厂家入库日期", EnName = "priceDate") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private String priceDate; + @ExportEntityMap(CnName = "物流到车日期", EnName = "arrivalDate") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private String arrivalDate; + @ExportEntityMap(CnName = "退库日期", EnName = "returnDate") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private String returnDate; + @ExportEntityMap(CnName = "存放地点", EnName = "locationName") + private String locationName; + @ExportEntityMap(CnName = "厂家销售通路", EnName = "manufSaleAccessName") + private String manufSaleAccessName; + @ExportEntityMap(CnName = "厂家合同价（含运费）", EnName = "contractPrice") + private String contractPrice; + @ExportEntityMap(CnName = "运费", EnName = "freight") + private String freight; + @ExportEntityMap(CnName = "买断状态", EnName = "settlementStatus") + private String settlementStatus; + @ExportEntityMap(CnName = "买断日期", EnName = "solidDate") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private String solidDate; + @ExportEntityMap(CnName = "全款销售指导价", EnName = "guidedPrice") + private String guidedPrice; + @ExportEntityMap(CnName = "贷款销售指导价", EnName = "manufactorSettlementPrice") + private String manufactorSettlementPrice; + @ExportEntityMap(CnName = "销售成交价", EnName = "salePrice") + private String salePrice; + @ExportEntityMap(CnName = "销售日期", EnName = "salesDate") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private String salesDate; + @ExportEntityMap(CnName = "备注", EnName = "remarks") + private String remarks; + @ExportEntityMap(CnName = "合格证状态", EnName = "certificateStateValue") + private String certificateStateValue; + @ExportEntityMap(CnName = "常用配置名称", EnName = "configName") + private String configName; + @ExportEntityMap(CnName = "是否问题车", EnName = "isProblemVeh") + private String isProblemVeh; + @ExportEntityMap(CnName = "发动机型号", EnName = "engineTypeValue") + private String engineTypeValue; + @ExportEntityMap(CnName = "保修卡号", EnName = "warrantyCardNo") + private String warrantyCardNo; + @ExportEntityMap(CnName = "燃料", EnName = "fuelTypeValue") + private String fuelTypeValue; + @ExportEntityMap(CnName = "规格型号", EnName = "specifications") + private String specifications; + @ExportEntityMap(CnName = "系别", EnName = "departmentValue") + private String departmentValue; + @ApiModelProperty("发车日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private String departureDate; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 8096255fbe..487c21d9b3 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -3,6 +3,7 @@ package com.yxt.anrui.base.api.basevehicle; import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo; import com.yxt.anrui.base.api.basevehicle.app.*; +import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutQuery; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -130,14 +131,27 @@ public interface BaseVehicleFeign { @GetMapping("/details/{sid}") public ResultBean details(@PathVariable("sid") String sid); + +// /** +// * 车辆列表导出 +// * +// * @param query 查询条件 +// */ +// @GetMapping("/exportExcel") +// @ApiOperation(value = "车辆列表导出") +// public void exportExcel(BaseVehicleExportQuery query); + /** - * 车辆列表导出 + * 车辆台账列表导出 * - * @param query 查询条件 + * @param baseVehicleExportQuery 查询条件 */ - @GetMapping("/exportExcel") - @ApiOperation(value = "车辆列表导出") - public void exportExcel(BaseVehicleExportQuery query); + @PostMapping("/exportExcel") + @ApiOperation(value = "车辆销售台账列表导出") + @ResponseBody + public void exportExcel(@RequestBody BaseVehicleExportQuery baseVehicleExportQuery) throws ParseException; + + /** * 删除、批量删除 diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index bc193de9b9..b9333cfdae 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -496,4 +496,7 @@ public interface BaseVehicleMapper extends BaseMapper { @Update("update base_vehicle set lockedState = #{code},lockedStateValue = #{remarks} where sid = #{vehSid}") ResultBean updateLockedState(@Param("vehSid") String vehSid,@Param("code") String code,@Param("remarks") String remarks); + + //导出车辆台账信息 + List selByExcel(@Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 1099afd7fd..d5eb7353fd 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -2489,6 +2489,7 @@ and deptSid = #{purchaseSystemSid} + UPDATE base_vehicle @@ -2497,4 +2498,111 @@ salesDate = null WHERE sid = #{sid} + + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 2849a8d403..5fe7b86419 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -130,6 +130,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { private ScmApplyInboundFeign scmApplyInboundFeign; @Autowired private ScmApplyInboundQueryFeign scmApplyInboundQueryFeign; + /** * 财务模块中的金蝶接口 */ @@ -161,7 +162,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { List records = page.getRecords(); for (BaseVehicleVo record : records) { String manPurOrderTypeValue = record.getManPurOrderTypeValue(); - if (manPurOrderTypeValue.equals("外采")) { + if (("外采").equals(manPurOrderTypeValue)) { record.setLibraryAge(Long.parseLong("0")); } else { //厂家库龄 @@ -436,7 +437,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { } //调车入库生成台账 if (eventType.equals(OperVehicleState.EventType.TC_SAVEVEH.getCode())) - baseVehicleService.saveVeh_tc(baseVehicle,baseVehicleDto.getCallOutOrgSid()); + baseVehicleService.saveVeh_tc(baseVehicle, baseVehicleDto.getCallOutOrgSid()); } String cgrkdSid = ""; if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())) { @@ -583,7 +584,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { } }*//* - *//*if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) {//外采 + *//*if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) {//外采 //根据外采编号查询外采的申请人部门 BaseOutsourcingApplication baseOutsourcingApplication = baseOutsourcingApplicationService.selectByNo(baseVehicle.getOrderingNo()); String createBySid = baseOutsourcingApplication.getCreateBySid(); @@ -613,14 +614,14 @@ public class BaseVehicleRest implements BaseVehicleFeign { String manCode = baseVehicleModelService.getCode(baseVehicle.getModelSid(), baseVehicle.getCreateOrgSid()); stkInStock.setFSupplierId(manCode); }*//* - *//** - * // 入库日期:FDate (必填项) - *//* + *//** + * // 入库日期:FDate (必填项) + *//* stkInStock.setFDate(baseVehicle.getPriceDate()); *//** - * // 物料列表:FInStockEntry (必填项) - *//* + * // 物料列表:FInStockEntry (必填项) + *//* List fInStockEntry = new ArrayList<>(); //直接调拨单的物料列表 List FPAYBILLENTRYs = new ArrayList<>(); @@ -628,20 +629,20 @@ public class BaseVehicleRest implements BaseVehicleFeign { StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry(); sf.setWlfz(baseVehicleDto.getCarBrandCode()); *//** - * 物料分组 - *//* - *//*BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.selectByModelSid(baseVehicleDto.getModelSid()); + * 物料分组 + *//* + *//*BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.selectByModelSid(baseVehicleDto.getModelSid()); if (baseVehicleBrand != null) { sf.setWlfz(baseVehicleBrand.getBrandCode()); }*//* - *//** - * 单价 对应厂家结算价 - *//* + *//** + * 单价 对应厂家结算价 + *//* sf.setFPrice(baseVehicleDto.getCostPrice() + ""); *//** - * 车辆类型 - *//* + * 车辆类型 + *//* //厂家采购 if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey()) || ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) { @@ -666,16 +667,16 @@ public class BaseVehicleRest implements BaseVehicleFeign { sf.setFCategoryIDKey(baseVehicleDto.getManPurOrderTypeKey()); *//** - * // 批号:FLot - *//* + * // 批号:FLot + *//* sf.setFLot(baseVehicleDto.getVinNo()); *//** - * // 物料编码:FMaterialId (必填项) - *//* + * // 物料编码:FMaterialId (必填项) + *//* sf.setFMaterialId(baseVehicleDto.getVinNo().substring(baseVehicleDto.getVinNo().length() - 8)); *//** - * // 仓库:FStockId-目前只分在途和正式两个仓库。 - *//* + * // 仓库:FStockId-目前只分在途和正式两个仓库。 + *//* //仓库编码 sf.setFStockId("ARZSCK"); *//*if (StringUtils.isBlank(baseVehicleDto.getLocation())) { @@ -785,12 +786,80 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setData(baseVehicleSelectVo); } + @Override - public void exportExcel(BaseVehicleExportQuery query) { + public void exportExcel(BaseVehicleExportQuery query) throws ParseException{ //得到所有要导出的数据 List baseVehicleExportVoList = baseVehicleService.listExcel(query); + for (BaseVehicleExportVo baseVehicleExportVo : baseVehicleExportVoList) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String manPurOrderTypeValue = baseVehicleExportVo.getManPurOrderTypeValue(); + if (("外采").equals(manPurOrderTypeValue)) { + baseVehicleExportVo.setLibraryAge(Long.parseLong("0")); + } else { + //厂家库龄 + if (baseVehicleExportVo.getPriceDate() != null) { + //厂家入库日期 + Date priceDate = sdf.parse(baseVehicleExportVo.getPriceDate()); + if (baseVehicleExportVo.getSolidDate() != null){ + //买断日期 + Date solidDate = sdf.parse(baseVehicleExportVo.getSolidDate()); + int i = priceDate.compareTo(solidDate); + long betweenDay = DateUtil.between(priceDate, solidDate, DateUnit.DAY); + baseVehicleExportVo.setLibraryAge(betweenDay * i * -1); + } else { + String today = DateUtil.today(); + DateTime currentDate = DateUtil.parse(today); + int i = priceDate.compareTo(currentDate); + long betweenDay = DateUtil.between(priceDate, currentDate, DateUnit.DAY); + baseVehicleExportVo.setLibraryAge(betweenDay * i * -1); + } + } + } + //公司库龄 + if (baseVehicleExportVo.getDepartureDate() != null) { + //发车日期 + Date departureDate = sdf.parse(baseVehicleExportVo.getDepartureDate()); + if (baseVehicleExportVo.getSalesDate() != null) { + //销售日期 + Date salesDate = sdf.parse(baseVehicleExportVo.getSalesDate()); + int i = departureDate.compareTo(salesDate); + long betweenDay = DateUtil.between(departureDate, salesDate, DateUnit.DAY); + baseVehicleExportVo.setOrgLibraryAge(betweenDay * i * -1); + } else { + String today = DateUtil.today(); + DateTime currentDate = DateUtil.parse(today); + int i = departureDate.compareTo(currentDate); + long betweenDay = DateUtil.between(departureDate, currentDate, DateUnit.DAY); + baseVehicleExportVo.setOrgLibraryAge(betweenDay * i * -1); + } + } + //买断库龄 + if (baseVehicleExportVo.getSolidDate() != null) { + //买断日期 + Date solidDate = sdf.parse(baseVehicleExportVo.getSolidDate()); + + if (baseVehicleExportVo.getSalesDate() != null) { + //销售日期 + Date salesDate = sdf.parse(baseVehicleExportVo.getSalesDate()); + int i = solidDate.compareTo(salesDate); + long betweenDay = DateUtil.between(solidDate, salesDate, DateUnit.DAY); + baseVehicleExportVo.setSettlementLibraryAge(betweenDay * i * -1); + } else { + String today = DateUtil.today(); + DateTime currentDate = DateUtil.parse(today); + int i = solidDate.compareTo(currentDate); + long betweenDay = DateUtil.between(solidDate, currentDate, DateUnit.DAY); + baseVehicleExportVo.setSettlementLibraryAge(betweenDay * i * -1); + } + } + String vinNo = baseVehicleExportVo.getVinNo(); + if (StringUtils.isNotBlank(vinNo)) { + baseVehicleExportVo.setLastVinNo(vinNo.substring(vinNo.length() - 8)); + } + } //定义导出的excel名字 - String excelName = "车辆管理列表"; + String excelName = "车辆台账列表"; String fileNameURL = ""; try { fileNameURL = URLEncoder.encode(excelName, "UTF-8"); @@ -801,6 +870,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { ExportExcelUtils.export(fileNameURL, baseVehicleExportVoList, BaseVehicleExportVo.class, response); } + @Override public ResultBean deleteBySids(String sids) { List sidList = Arrays.asList(sids.split(",")); @@ -879,6 +949,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { * @param pq 查询条件 * @return */ + @Override public ResultBean> exiCarPagerList(PagerQuery pq) { ResultBean> rb = ResultBean.fireFail(); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index f60229c018..19bd0521f3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -505,6 +505,7 @@ public class BaseVehicleService extends MybatisBaseService listExcel(BaseVehicleExportQuery pagerQuery) { + QueryWrapper qw = new QueryWrapper<>(); List sids = pagerQuery.getSids(); if (sids != null) { @@ -512,21 +513,167 @@ public class BaseVehicleService extends MybatisBaseService baseVehicleExportVoList = baseMapper.selByExcel(qw); + int id = 1; + for (BaseVehicleExportVo baseVehicleExportVo : baseVehicleExportVoList) { + baseVehicleExportVo.setRankNo(id); + id = id + 1; } - - return baseMapper.listExcel(qw); + return baseVehicleExportVoList; } /** @@ -853,8 +1000,8 @@ public class BaseVehicleService extends MybatisBaseService appExistingCarBuildQW(VehicleModelPriceQuery pagerQuery) { QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(pagerQuery.getName())) { // 车型名称 - qw.and(wrapper -> wrapper.like("bvm.vehicleAlias", pagerQuery.getName()).or().like("bvm.vehicleTypeCode", pagerQuery.getName()).or().like("bmc.configCode",pagerQuery.getName())); + qw.and(wrapper -> wrapper.like("bvm.vehicleAlias", pagerQuery.getName()).or().like("bvm.vehicleTypeCode", pagerQuery.getName()).or().like("bmc.configCode", pagerQuery.getName())); } if (StringUtils.isNotBlank(pagerQuery.getEmissionStandard())) { // 排放标准 qw.eq("bvm.emissionStandardValue", pagerQuery.getEmissionStandard());