From 5d2f0b98cc6d0f811e7a931b22f64d3e58efb7f9 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Sat, 2 Apr 2022 11:25:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B8=B8=E7=94=A8=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95=E3=80=81=E6=8E=92=E4=BA=A7?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basemodelconfig/BaseModelConfig.java | 10 ++- .../basemodelconfig/BaseModelConfigDto.java | 14 ++- .../basemodelconfig/BaseModelConfigQuery.java | 56 +++++++++--- .../BaseModelConfigSelectVo.java | 86 +++++++++++++++---- .../basemodelconfig/BaseModelConfigVo.java | 60 ++----------- .../BaseVehmodelConfigVo.java | 4 +- .../api/busvehicleapply/BusVehicleApply.java | 2 + .../busvehicleapply/BusVehicleApplyDto.java | 3 + .../BaseModelConfigMapper.java | 2 +- .../basemodelconfig/BaseModelConfigMapper.xml | 27 ++++-- .../basemodelconfig/BaseModelConfigRest.java | 24 +++--- .../BaseModelConfigService.java | 69 +++++++++++++-- .../BusVehicleApplyService.java | 3 +- 13 files changed, 244 insertions(+), 116 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfig.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfig.java index bbc9d8ec23..a30f5b4c53 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfig.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfig.java @@ -29,8 +29,8 @@ public class BaseModelConfig extends BaseEntity { /* @ApiModelProperty("车型sid(陕汽必须的字段)") private String vehicleSid;*/ - @ApiModelProperty("车型配置代码(陕汽必须的字段)") - private String vehicleCode; +/* @ApiModelProperty("车型配置代码(陕汽必须的字段)") + private String vehicleCode;*/ @ApiModelProperty("车身颜色key") private String carColorKey; @@ -169,4 +169,10 @@ public class BaseModelConfig extends BaseEntity { @ApiModelProperty("简述配置名称") private String configName; + + @ApiModelProperty("导流罩key") + private String baffleModelKey; + + @ApiModelProperty("多媒体key") + private String multimediaKey; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigDto.java index 536b9b0fb7..7326b37cb0 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigDto.java @@ -25,11 +25,11 @@ import javax.validation.constraints.NotBlank; @Data public class BaseModelConfigDto implements Dto { - @ApiModelProperty(value = "车型sid", required = true) - private String vehicleSid; +/* @ApiModelProperty(value = "车型sid", required = true) + private String vehicleSid;*/ - @ApiModelProperty("车型配置代码(陕汽必须的字段)") - private String vehicleCode; +/* @ApiModelProperty("车型配置代码(陕汽必须的字段)") + private String vehicleCode;*/ @ApiModelProperty("车身颜色key") private String carColorKey; @@ -168,4 +168,10 @@ public class BaseModelConfigDto implements Dto { @ApiModelProperty("简述配置名称") private String configName; + + @ApiModelProperty("导流罩key") + private String baffleModelKey; + + @ApiModelProperty("多媒体key") + private String multimediaKey; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigQuery.java index 9e799b5ed0..6e1c6dc25a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigQuery.java @@ -23,16 +23,48 @@ import lombok.Data; @Data public class BaseModelConfigQuery implements Query { - - @ApiModelProperty("车型sid(陕汽必须的字段)") - private String vehicleSid; - - @ApiModelProperty("车型配置代码(陕汽必须的字段)") - private String vehicleCode; - - @ApiModelProperty("驾驶室") - private String specification; - - @ApiModelProperty("鞍座") - private String saddle; +/* @ApiModelProperty("车型sid(陕汽必须的字段)") + private String vehicleSid;*/ +/* @ApiModelProperty("车型配置代码(陕汽必须的字段)") + private String vehicleCode;*/ + @ApiModelProperty("车身颜色key") + private String carColorKey; + @ApiModelProperty("缓速器key") + private String slowMachineKey; + @ApiModelProperty("后视镜key") + private String rearViewMirrorKey; + @ApiModelProperty("轮胎规格key") + private String tireSizeKey; + @ApiModelProperty("驾驶室规格key") + private String specificationKey; + @ApiModelProperty("后桥速比key") + private String rearAxleRatioKey; + @ApiModelProperty("空调key") + private String airConditionerKey; + @ApiModelProperty("轮毂材质key") + private String hubMaterialKey; + @ApiModelProperty("导流罩key") + private String baffleModelKey; + @ApiModelProperty("悬架key") + private String suspensionKey; + @ApiModelProperty("座椅key") + private String seatKey; + @ApiModelProperty("护轮罩key（有、无）") + private String tireCoverKey; + @ApiModelProperty("鞍座key") + private String saddleKey; + @ApiModelProperty("轴距key") + private String wheelbaseKey; + @ApiModelProperty("保险杠key") + private String bumperKey; + @ApiModelProperty("配置包key") + private String configuringBaoKey; + @ApiModelProperty("独立热源key(1有、0无)") + private String independentSourcesKey; + @ApiModelProperty("油箱/气罐key") + private String fuelTankKey; + @ApiModelProperty("多媒体key") + private String multimediaKey; + @ApiModelProperty("简述配置名称") + private String configName; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigSelectVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigSelectVo.java index f7a56080d6..1af32d478a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigSelectVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigSelectVo.java @@ -13,34 +13,52 @@ import lombok.Data; public class BaseModelConfigSelectVo implements Vo { private static final long serialVersionUID = -664880268264639714L; - @ApiModelProperty(value = "车型配置代码") - private String vehicleCode; + @ApiModelProperty("车身颜色key") + private String carColorKey; - @ApiModelProperty(value = "车身颜色") + @ApiModelProperty("车身颜色(陕汽必须的字段)") private String carColor; - @ApiModelProperty(value = "驾驶室规格") + @ApiModelProperty("驾驶室规格key") + private String specificationKey; + + @ApiModelProperty("驾驶室规格(陕汽必须的字段)") private String specification; - @ApiModelProperty(value = "油箱/气罐") + @ApiModelProperty("油箱/气罐key") + private String fuelTankKey; + + @ApiModelProperty("油箱/气罐(陕汽必须的字段)") private String fuelTank; - @ApiModelProperty(value = "导流罩") + @ApiModelProperty("导流罩(陕汽必须的字段)") private String baffleModel; - @ApiModelProperty(value = "独立热源") + @ApiModelProperty("独立热源key(1有、0无)") + private String independentSourcesKey; + + @ApiModelProperty("独立热源（有、无）") private String independentSources; - @ApiModelProperty(value = "独轮罩") + @ApiModelProperty("护轮罩key（有、无）") + private String tireCoverKey; + + @ApiModelProperty("护轮罩（有、无）") private String tireCover; - @ApiModelProperty(value = "鞍座") + @ApiModelProperty("鞍座key") + private String saddleKey; + + @ApiModelProperty("鞍座（陕汽必须的字段）") private String saddle; - @ApiModelProperty(value = "空调") + @ApiModelProperty("空调key") + private String airConditionerKey; + + @ApiModelProperty("空调（陕汽必须的字段）") private String airConditioner; - @ApiModelProperty(value = "其他配置") + @ApiModelProperty("其他配置") private String otherConfig; /* @ApiModelProperty("彩色仪表盘（是、否）") @@ -52,45 +70,75 @@ public class BaseModelConfigSelectVo implements Vo { @ApiModelProperty("公司指导价（陕汽必须的字段）") private String companyGuidePrice;*/ + @ApiModelProperty("后桥速比key") + private String rearAxleRatioKey; + @ApiModelProperty("后桥速比") private String rearAxleRatio; - @ApiModelProperty("委改厂（欧曼）") - private String appointToFactory; + /* @ApiModelProperty("委改厂（欧曼）") + private String appointToFactory;*/ + + @ApiModelProperty("轮胎规格key") + private String tireSizeKey; @ApiModelProperty("轮胎规格") private String tireSize; + @ApiModelProperty("缓速器key") + private String slowMachineKey; + @ApiModelProperty("缓速器") private String slowMachine; + @ApiModelProperty("后视镜key") + private String rearViewMirrorKey; + @ApiModelProperty("后视镜") private String rearViewMirror; + @ApiModelProperty("轴距key") + private String wheelbaseKey; + @ApiModelProperty("轴距（重汽、欧曼）") private String wheelbase; + @ApiModelProperty("悬架key") + private String suspensionKey; + @ApiModelProperty("悬架（重汽、欧曼）") private String suspension; @ApiModelProperty("货箱（重汽、欧曼）") private String packingCase; - @ApiModelProperty("上装装置（欧曼）") - private String installingDevice; + /* @ApiModelProperty("上装装置（欧曼）") + private String installingDevice;*/ + + @ApiModelProperty("座椅key") + private String seatKey; @ApiModelProperty("座椅（陕汽、欧曼）") private String seat; + @ApiModelProperty("轮毂材质key") + private String hubMaterialKey; + @ApiModelProperty("轮毂材质（重汽）") private String hubMaterial; + @ApiModelProperty("配置包key") + private String configuringBaoKey; + @ApiModelProperty("配置包（陕汽）") private String configuringBao; @ApiModelProperty("多媒体（陕汽）") private String multimedia; + @ApiModelProperty("保险杠key") + private String bumperKey; + @ApiModelProperty("保险杠（欧曼）") private String bumper; @@ -101,7 +149,13 @@ public class BaseModelConfigSelectVo implements Vo { private Integer isDel; @ApiModelProperty("简述配置名称") - private Integer configName; + private String configName; + + @ApiModelProperty("导流罩key") + private String baffleModelKey; + + @ApiModelProperty("多媒体key") + private String multimediaKey; @ApiModelProperty(value = "备注") private String remarks; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigVo.java index 25f62c1b42..1a4823a112 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigVo.java @@ -23,156 +23,110 @@ import lombok.Data; @Data public class BaseModelConfigVo implements Vo { - @ApiModelProperty(value = "车型配置sid") + @ApiModelProperty(value = "常用配置sid") private String sid; - @ApiModelProperty("车型配置代码(陕汽必须的字段)") - private String vehicleCode; - +/* @ApiModelProperty("车型配置代码(陕汽必须的字段)") + private String vehicleCode;*/ @ApiModelProperty("车身颜色key") private String carColorKey; - @ApiModelProperty("车身颜色(陕汽必须的字段)") private String carColor; - @ApiModelProperty("驾驶室规格key") private String specificationKey; - @ApiModelProperty("驾驶室规格(陕汽必须的字段)") private String specification; - @ApiModelProperty("油箱/气罐key") private String fuelTankKey; - @ApiModelProperty("油箱/气罐(陕汽必须的字段)") private String fuelTank; - + @ApiModelProperty("导流罩key") + private String baffleModelKey; @ApiModelProperty("导流罩(陕汽必须的字段)") private String baffleModel; - @ApiModelProperty("独立热源key(1有、0无)") private String independentSourcesKey; - @ApiModelProperty("独立热源（有、无）") private String independentSources; - @ApiModelProperty("护轮罩key（有、无）") private String tireCoverKey; - @ApiModelProperty("护轮罩（有、无）") private String tireCover; - @ApiModelProperty("鞍座key") private String saddleKey; - @ApiModelProperty("鞍座（陕汽必须的字段）") private String saddle; - @ApiModelProperty("空调key") private String airConditionerKey; - @ApiModelProperty("空调（陕汽必须的字段）") private String airConditioner; - @ApiModelProperty("其他配置") private String otherConfig; - /* @ApiModelProperty("彩色仪表盘（是、否）") private String isColorPanel; - @ApiModelProperty("基础单位") private String basedUnit; - @ApiModelProperty("公司指导价（陕汽必须的字段）") private String companyGuidePrice;*/ - @ApiModelProperty("后桥速比key") private String rearAxleRatioKey; - @ApiModelProperty("后桥速比") private String rearAxleRatio; - /* @ApiModelProperty("委改厂（欧曼）") private String appointToFactory;*/ - @ApiModelProperty("轮胎规格key") private String tireSizeKey; - @ApiModelProperty("轮胎规格") private String tireSize; - @ApiModelProperty("缓速器key") private String slowMachineKey; - @ApiModelProperty("缓速器") private String slowMachine; - @ApiModelProperty("后视镜key") private String rearViewMirrorKey; - @ApiModelProperty("后视镜") private String rearViewMirror; - @ApiModelProperty("轴距key") private String wheelbaseKey; - @ApiModelProperty("轴距（重汽、欧曼）") private String wheelbase; - @ApiModelProperty("悬架key") private String suspensionKey; - @ApiModelProperty("悬架（重汽、欧曼）") private String suspension; - @ApiModelProperty("货箱（重汽、欧曼）") private String packingCase; - /* @ApiModelProperty("上装装置（欧曼）") private String installingDevice;*/ - @ApiModelProperty("座椅key") private String seatKey; - @ApiModelProperty("座椅（陕汽、欧曼）") private String seat; - @ApiModelProperty("轮毂材质key") private String hubMaterialKey; - @ApiModelProperty("轮毂材质（重汽）") private String hubMaterial; - @ApiModelProperty("配置包key") private String configuringBaoKey; - @ApiModelProperty("配置包（陕汽）") private String configuringBao; - + @ApiModelProperty("多媒体key") + private String multimediaKey; @ApiModelProperty("多媒体（陕汽）") private String multimedia; - @ApiModelProperty("保险杠key") private String bumperKey; - @ApiModelProperty("保险杠（欧曼）") private String bumper; - @ApiModelProperty("品牌名称") private String brandName; - @ApiModelProperty("是否可以删除（1是，0否）") private Integer isDel; - @ApiModelProperty("简述配置名称") private String configName; - @ApiModelProperty(value = "备注") private String remarks; - - /* @ApiModelProperty(value = "车型名称") private String modelName; - @ApiModelProperty(value = "发动机型号") private String engineTypeValue;*/ } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java index e29f530872..5a88ce3fe6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java @@ -60,9 +60,9 @@ public class BaseVehmodelConfigVo implements Vo { @ApiModelProperty("简述配置名称") private String configName; // 简述配置名称 @ApiModelProperty("厂家结算价") - private BigDecimal manufactorSettlementPrice; // 厂家结算价 + private String manufactorSettlementPrice; // 厂家结算价 @ApiModelProperty("销售参考价") - private BigDecimal salesReferencePrice; // 销售参考价 + private String salesReferencePrice; // 销售参考价 @ApiModelProperty("价格有效期") private String priceValidity; // 价格有效期 @ApiModelProperty(value = "是否常用车型") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java index 895f108d65..90bbae62a6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java @@ -39,4 +39,6 @@ public class BusVehicleApply extends BaseEntity { private String applicationCode; @ApiModelProperty("创建组织sid") private String createByDeptSid; + @ApiModelProperty("当前订金金额") + private BigDecimal currentAmount; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java index 3ffa435440..e75ad9c246 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -46,6 +47,8 @@ public class BusVehicleApplyDto implements Dto { private String applicationCode; @ApiModelProperty("创建组织sid") private String createByDeptSid; + @ApiModelProperty("当前订金金额") + private String currentAmount; @ApiModelProperty("车辆排产申请详情") private List busVehicleApplyDetailDtoList; // 车辆排产申请详情 } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java index d8b6e89030..f2538ac727 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java @@ -54,7 +54,7 @@ public interface BaseModelConfigMapper extends BaseMapper { * @param vehicleCode 车型配置代码 * @return */ - int selectBySidAndCode(@Param("vehicleSid") String vehicleSid, @Param("vehicleCode") String vehicleCode); + /*int selectBySidAndCode(@Param("vehicleSid") String vehicleSid, @Param("vehicleCode") String vehicleCode);*/ /** * 根据车型sid和车型配置代码查询除该车型配置外其他的配置信息个数 diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml index d22eadce1e..3d3bfb0a24 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml @@ -5,51 +5,68 @@ @@ -159,7 +176,7 @@