销售订单-意向车型分页、虚拟订单分页完善车型返回信息及挂靠公司修复文件地址

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<ExiCarConfigDetailVo> getModelAndConfigDetails(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid);
 
+    /**
+     * 根据车型sid和配置sid查询车型名称、更多配置、指导价等信息
+     *
+     * @param modelSid  车型sid
+     * @param configSid 配置sid
+     * @return
+     */
     @ApiOperation("根据车型sid和配置sid查询信息")
     @GetMapping("selectOne")
     ResultBean<BaseVehmodelVo> selectOne(@RequestParam(value = "modelSid") String modelSid, @RequestParam(value = "modelConfigSid") String configSid);

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

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<BaseAffiliatC
             for (BaseAffiliatCompanyAppendixVo baseAffiliatCompanyAppendixVo : list) {
                 String filePath = baseAffiliatCompanyAppendixVo.getFilePath();
                 String urlPrefix = fileUploadComponent.getUrlPrefix();
-                path = urlPrefix + filePath;
+                filePath = urlPrefix + filePath;
-                baseAffiliatCompanyAppendixVo.setFileUrl(path);
+                baseAffiliatCompanyAppendixVo.setFilePath(filePath);
+//                baseAffiliatCompanyAppendixVo.setFileUrl(path);
                 String attachType = baseAffiliatCompanyAppendixVo.getAttachType();
                 if (attachType.equals("0001")) {
                     yyzzList.add(baseAffiliatCompanyAppendixVo);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml

@@ -209,10 +209,12 @@
     </select>
 
     <select id="selectO" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo">
-        select guidedPrice
+        select bvc.guidedPrice, bm.modelName, bmc.otherConfig
-        from base_vehmodel_config
+        from base_vehmodel_config bvc
-        where modelSid = #{modelSid}
+                 left join base_vehicle_model bm on bvc.modelSid = bm.sid
-          and configurationItemsSid = #{configSid}
+                 left join base_model_config bmc on bvc.configurationItemsSid = bmc.sid
+        where bvc.modelSid = #{modelSid}
+          and bvc.configurationItemsSid = #{configSid}
     </select>
     <select id="selectCarConfigSummary"
             resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo">

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositFeign.java

@@ -35,4 +35,5 @@ public interface PcBusMainDepositFeign {
     @ApiOperation(value = "销售订单-查询配置该业务员该客户选择的该车型及配置下的所有车辆的集合")
     ResultBean<List<String>> selectVehicleList(@SpringQueryMap PcBusMainDepositVehicleQuery query);
 
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositVo.java

@@ -1,7 +1,5 @@
 package com.yxt.anrui.buscenter.api.busmaindeposit.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;
@@ -17,10 +15,6 @@ public class PcBusMainDepositVo implements Vo {
 
     @ApiModelProperty(value = "品牌")
     private String brandName;
-    @ApiModelProperty(value = "车型")
-    private String modelName;
-    @ApiModelProperty(value = "车型配置")
-    private String config;
     @ApiModelProperty(value = "车型sid")
     private String modelSid;
     @ApiModelProperty(value = "车型配置sid")
@@ -29,5 +23,20 @@ public class PcBusMainDepositVo implements Vo {
     @ApiModelProperty(value = "单台指导价")
     private String guidedPrice;
 
+    @ApiModelProperty(value = "车型别名")
+    private String modelAlias;
+    /**
+     * 车型配置即车型的长名称
+     */
+    @ApiModelProperty(value = "车型配置")
+    private String modelName;
+    /**
+     * 常用配置即简述配置名称
+     */
+    @ApiModelProperty(value = "常用配置")
+    private String config;
+    @ApiModelProperty(value = "更多配置")
+    private String otherConfig;
+
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcMainDepositVo.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.buscenter.api.busmaindeposit.pc;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/10 16:21
+ * @Description
+ */
+@Data
+public class PcMainDepositVo implements Vo {
+    private static final long serialVersionUID = 3373549091778464382L;
+
+
+
+
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml

@@ -148,7 +148,7 @@
 
     <select id="orderPageList" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVo">
         select bv.brandName,
-               bv.modelName,
+               bv.modelName as modelAlias,
                bv.modelotherConfig as config,
                bv.modelSid,
                bv.modelConfigSid

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<BusMainDepositMapp
         List<PcBusMainDepositVo> 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<BaseVehmodelVo> 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<BusMainDepositMapp
         String staffSid = query.getStaffSid();
         String customerSid = query.getCustomerSid();
         List<String> stringList = baseMapper.selectVehicleList(modelSid, modelConfigSid, staffSid, customerSid);
-        if(stringList.size() == 0){
+        if (stringList.size() == 0) {
             return rb;
         }
         return rb.success().setData(stringList);

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

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<CrmVehicledemand
                 ResultBean<BaseVehmodelVo> 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());
                 }
             }
         }