diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java index 2a29215e5e..6ea081b664 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java @@ -87,6 +87,13 @@ public interface BaseVehmodelConfigFeign { @GetMapping("/getModelAndConfigDetails/{modelSid}/{configSid}") public ResultBean getModelAndConfigDetails(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid); + /** + * 根据车型sid和配置sid查询车型名称、更多配置、指导价等信息 + * + * @param modelSid 车型sid + * @param configSid 配置sid + * @return + */ @ApiOperation("根据车型sid和配置sid查询信息") @GetMapping("selectOne") ResultBean selectOne(@RequestParam(value = "modelSid") String modelSid, @RequestParam(value = "modelConfigSid") String configSid); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java index e8ff99f72c..8d38776c25 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java @@ -3,6 +3,7 @@ package com.yxt.anrui.base.api.basevehmodelconfig; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -13,7 +14,11 @@ import lombok.Data; @Data public class BaseVehmodelVo implements Vo { private static final long serialVersionUID = 2821138970776546215L; - + @ApiModelProperty(value = "单台指导价") @JsonSerialize(using = ToStringSerializer.class) private String guidedPrice; + @ApiModelProperty(value = "车型配置") + private String modelName; + @ApiModelProperty(value = "更多配置") + private String otherConfig; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyService.java index 97c7ad76e7..90aea7d5e5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyService.java @@ -133,8 +133,9 @@ public class BaseAffiliatCompanyService extends MybatisBaseService SELECT bvm.sid AS modelSid, - bvm.vehicleAlias, - bvm.brandName, - bvm.vehicleVersionValue, - bvm.fuelTypeValue, - bvm.gearboxTypeValue + bvm.vehicleAlias, + bvm.brandName, + bvm.vehicleVersionValue, + bvm.fuelTypeValue, + bvm.gearboxTypeValue FROM base_vehmodel_config bvc - LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid - LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid + LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid + LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid ${ew.sqlSegment} @@ -209,10 +209,12 @@ select bv.brandName, - bv.modelName, + bv.modelName as modelAlias, bv.modelotherConfig as config, bv.modelSid, bv.modelConfigSid diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index c65754bd06..396f59f0ca 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -1457,11 +1457,13 @@ public class BusMainDepositService extends MybatisBaseService list = p.getRecords(); if (list.size() > 0) { for (int i = 0; i < list.size(); i++) { - if(list.get(i) != null){ + if (list.get(i) != null) { //根据车型sid及配置sid查询单台指导价 ResultBean voResultBean = baseVehmodelConfigFeign.selectOne(list.get(i).getModelSid(), list.get(i).getModelConfigSid()); if (voResultBean.getSuccess()) { list.get(i).setGuidedPrice(voResultBean.getData().getGuidedPrice()); + list.get(i).setModelName(voResultBean.getData().getModelName()); + list.get(i).setOtherConfig(voResultBean.getData().getOtherConfig()); } } } @@ -1493,7 +1495,7 @@ public class BusMainDepositService extends MybatisBaseService stringList = baseMapper.selectVehicleList(modelSid, modelConfigSid, staffSid, customerSid); - if(stringList.size() == 0){ + if (stringList.size() == 0) { return rb; } return rb.success().setData(stringList); diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java index 5af5986647..a16d2de588 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java @@ -1,7 +1,5 @@ package com.yxt.anrui.crm.api.crmvehicledemand.pc; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,9 +21,18 @@ public class PcCrmVehicleDemandVo implements Vo { private String brandName; @ApiModelProperty(value = "车型别名") private String modelAlias; - + /** + * 车型配置即车型的长名称 + */ + @ApiModelProperty(value = "车型配置") + private String modelName; + /** + * 常用配置即简述配置名称 + */ @ApiModelProperty(value = "常用配置") private String config; + @ApiModelProperty(value = "更多配置") + private String otherConfig; @ApiModelProperty(value = "单台指导价") private String guidedPrice; } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java index ac472f770e..60d511f3c5 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java @@ -385,6 +385,8 @@ public class CrmVehicledemandService extends MybatisBaseService voResultBean = baseVehmodelConfigFeign.selectOne(list.get(i).getModelSid(), list.get(i).getModelConfigSid()); if (voResultBean.getSuccess()) { list.get(i).setGuidedPrice(voResultBean.getData().getGuidedPrice()); + list.get(i).setModelName(voResultBean.getData().getModelName()); + list.get(i).setOtherConfig(voResultBean.getData().getOtherConfig()); } } }