修改app车型查询，pc车型查询，客户管理接口

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigListQuery.java

@@ -15,25 +15,69 @@ import javax.validation.constraints.NotBlank;
 public class BaseModelConfigListQuery implements Query {
     private static final long serialVersionUID = 932522587144455873L;
 
-    @ApiModelProperty(value = "车型sid", required = true)
+    @ApiModelProperty(value = "车型sid")
-    @NotBlank(message = "请选择车型")
     private String modelSid;
 
-    @ApiModelProperty(value = "颜色")
+    @ApiModelProperty(value = "配置sid")
+    private String configSid;
+
+    @ApiModelProperty(value = "颜色key")
     private String carColor;
 
-    @ApiModelProperty(value = "缓速器")
+    @ApiModelProperty(value = "缓速器key")
     private String slowMachine;
 
-    @ApiModelProperty(value = "驾驶室")
+    @ApiModelProperty(value = "驾驶室key")
     private String specification;
 
-    @ApiModelProperty(value = "后桥速比")
+    @ApiModelProperty(value = "后桥速比key")
     private String rearAxleRatio;
 
-    @ApiModelProperty(value = "燃料箱")
+    @ApiModelProperty(value = "燃料箱key")
     private String fuelTank;
 
+    @ApiModelProperty(value = "后视镜key")
+    private String rearViewMirrorKey;
+
+    @ApiModelProperty(value = "轮胎key")
+    private String tireSizeKey;
+
+    @ApiModelProperty(value = "空调key")
+    private String airConditionerKey;
+
+    @ApiModelProperty(value = "轮毂材质key")
+    private String hubMaterialKey;
+
+    @ApiModelProperty(value = "导流罩key")
+    private String baffleModelKey;
+
+    @ApiModelProperty(value = "悬架key")
+    private String suspensionKey;
+
+    @ApiModelProperty(value = "座椅key")
+    private String seatKey;
+
+    @ApiModelProperty(value = "护轮罩key")
+    private String tireCoverKey;
+
+    @ApiModelProperty(value = "鞍座key")
+    private String saddleKey;
+
+    @ApiModelProperty(value = "轴距key")
+    private String wheelbaseKey;
+
+    @ApiModelProperty(value = "保险杠key")
+    private String bumperKey;
+
+    @ApiModelProperty(value = "配置包key")
+    private String configuringBaoKey;
+
+    @ApiModelProperty(value = "独立热源key")
+    private String independentSourcesKey;
+
+    @ApiModelProperty(value = "多媒体key")
+    private String multimediaKey;
+
     @ApiModelProperty(value = "常用配置")
     private String configName;
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppPurchaseDetailsVo.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppPurchaseDetailsVo implements Vo {
+
+    @ApiModelProperty("车辆sid")
+    private String sid;
+    @ApiModelProperty("车辆照片")
+    private List<String> vehicleImages;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车辆状态")
+    private String vehicleStateValue;
+    @ApiModelProperty("车辆标签")
+    private String vehicleLabel;
+    @ApiModelProperty("促销政策")
+    private String promotionPolicy;
+    @ApiModelProperty("存放地点")
+    private String location;
+    @ApiModelProperty("入库日期")
+    private String priceDate;
+    @ApiModelProperty("销售指导价")
+    private String guidedPrice;
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseExistingCarListPageVo.java

@@ -28,6 +28,9 @@ public class BaseExistingCarListPageVo implements Vo {
     @ApiModelProperty(value = "存放地点")
     private String location;
 
+    @ApiModelProperty(value = "合格证")
+    private String certificate;
+
 //    @ApiModelProperty(value = "销售指导价")
 //    @JsonSerialize(using = ToStringSerializer.class)
 //    private String guidedPrice;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@@ -177,6 +177,16 @@ public interface BaseVehicleFeign {
     @PostMapping("/selExistingCarPageList")
     public ResultBean<PagerVo<BaseExistingCarListPageVo>> selExistingCarPageList(@RequestBody PagerQuery<BaseExistingCarPageQuery> pagerQuery);
 
+    /**
+     * pc排产车详情（新）
+     *
+     * @param vinNo
+     * @return
+     */
+    @ApiOperation("根据车架号查询现车详情(新)")
+    @GetMapping("/getPurchaseDetails/{vinNo}")
+    ResultBean<AppPurchaseDetailsVo> getPurchaseDetails(@PathVariable("vinNo") String vinNo);
+
     @ApiOperation("采购退库选择车辆分页列表")
     @PostMapping("/vehicleReturnList")
     ResultBean<PagerVo<BaseVehicleReturnVo>> vehicleReturnList(@RequestBody PagerQuery<BaseVehicleReturnQuery> pagerQuery);

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@@ -99,6 +99,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<AppPurchaseDetailsVo> getPurchaseDetails(String vinNo) {
+        return null;
+    }
+
     @Override
     public ResultBean<PagerVo<BaseVehicleReturnVo>> vehicleReturnList(PagerQuery<BaseVehicleReturnQuery> pagerQuery) {
         return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelListQuery.java

@@ -17,7 +17,7 @@ public class BaseVehicleModelListQuery implements Query {
     private String modelName;
     @ApiModelProperty(value = "品牌sid")
     private String carBrand;
-    @ApiModelProperty(value = "功能")
+    @ApiModelProperty(value = "功能key")
     private String vehicleType;
     @ApiModelProperty(value = "系列key")
     private String productLine;
@@ -27,12 +27,24 @@ public class BaseVehicleModelListQuery implements Query {
     private String power;
     @ApiModelProperty(value = "版本key")
     private String vehicleVersion;
-    @ApiModelProperty(value = "燃料")
+    @ApiModelProperty(value = "燃料key")
     private String fuelType;
     @ApiModelProperty(value = "变速箱key")
     private String gearboxType;
+    @ApiModelProperty(value = "排放标准key")
+    private String emissionStandard;
+    @ApiModelProperty(value = "发动机型号key")
+    private String engineType;
+    @ApiModelProperty(value = "细分市场")
+    private String marketSegments;
+    @ApiModelProperty(value = "规格型号")
+    private String specifications;
     @ApiModelProperty(value = "用户sid")
     private String userSid;
+    @ApiModelProperty(value = "车型sid")
+    private String modelSid;
+    @ApiModelProperty(value = "配置sid")
+    private String configSid;
     @ApiModelProperty(value = "分公司sid")
     private String useOrg;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@@ -295,7 +295,7 @@
                  LEFT JOIN base_vehicle_model bvm ON bvm.sid = bvc.modelSid
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
-          AND bvc.useOrg = #{useOrg}
+          AND bvc.useOrgSid = #{useOrg}
     </select>
 
     <select id="configPageList" resultType="com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigListVo">
@@ -326,7 +326,7 @@
                 WHERE bv.modelSid = bvc.modelSid
                   AND bv.modelConfigSid =
                       bvc.configurationItemsSid
-                  and bv.useOrg = bvc.useOrg)    AS nowCarNum,
+                  and bv.useOrg = bvc.useOrgSid)    AS nowCarNum,
                (SELECT count(*)
                 FROM bus_vehicle_apply_detail bvad
                 WHERE bvad.vehicleSid = bvc.modelSid
@@ -535,7 +535,7 @@
         FROM base_vehmodel_config bvc
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
-          AND bvc.useOrg != #{useOrg}
+          AND bvc.useOrgSid != #{useOrg}
     </select>
     <select id="getCarConfigSummary" resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo">
         SELECT bmc.sid,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java

@@ -244,6 +244,11 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
     @Override
     public ResultBean<AppModelConfigVo> getModelConfigList(PagerQuery<AppModelConfigListQuery> pagerQuery) {
         ResultBean<AppModelConfigVo> rb = ResultBean.fireFail();
+        String modelSid = pagerQuery.getParams().getModelSid();
+        String userSid = pagerQuery.getParams().getUserSid();
+        if (StringUtils.isNull(modelSid) || StringUtils.isNull(userSid)) {
+            return rb.fail().setMsg("用户sid或用户sid为空");
+        }
         AppModelConfigVo vo = baseModelConfigService.getModelConfigList(pagerQuery);
         return rb.success().setData(vo);
     }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java

@@ -383,6 +383,62 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         if (StringUtils.isNotBlank(query.getFuelTank())) {
             qw.like("bc.fuelTank", query.getFuelTank());
         }
+        //后视镜
+        if (StringUtils.isNotBlank(query.getRearViewMirrorKey())) {
+            qw.like("bc.rearViewMirrorKey", query.getRearViewMirrorKey());
+        }
+        //轮胎
+        if (StringUtils.isNotBlank(query.getTireSizeKey())) {
+            qw.like("bc.tireSizeKey", query.getTireSizeKey());
+        }
+        //空调
+        if (StringUtils.isNotBlank(query.getAirConditionerKey())) {
+            qw.like("bc.airConditionerKey", query.getAirConditionerKey());
+        }
+        //轮毂材质
+        if (StringUtils.isNotBlank(query.getHubMaterialKey())) {
+            qw.like("bc.hubMaterialKey", query.getHubMaterialKey());
+        }
+        //导流罩
+        if (StringUtils.isNotBlank(query.getBaffleModelKey())) {
+            qw.like("bc.baffleModelKey", query.getBaffleModelKey());
+        }
+        //悬架
+        if (StringUtils.isNotBlank(query.getSuspensionKey())) {
+            qw.like("bc.suspensionKey", query.getSuspensionKey());
+        }
+        //座椅
+        if (StringUtils.isNotBlank(query.getSeatKey())) {
+            qw.like("bc.seatKey", query.getSeatKey());
+        }
+        //护轮罩
+        if (StringUtils.isNotBlank(query.getTireCoverKey())) {
+            qw.like("bc.tireCoverKey", query.getTireCoverKey());
+        }
+        //鞍座
+        if (StringUtils.isNotBlank(query.getSaddleKey())) {
+            qw.like("bc.saddleKey", query.getSaddleKey());
+        }
+        //轴距
+        if (StringUtils.isNotBlank(query.getWheelbaseKey())) {
+            qw.like("bc.wheelbaseKey", query.getWheelbaseKey());
+        }
+        //保险杠
+        if (StringUtils.isNotBlank(query.getBumperKey())) {
+            qw.like("bc.bumperKey", query.getBumperKey());
+        }
+        //配置包
+        if (StringUtils.isNotBlank(query.getConfiguringBaoKey())) {
+            qw.like("bc.configuringBaoKey", query.getConfiguringBaoKey());
+        }
+        //独立热源
+        if (StringUtils.isNotBlank(query.getIndependentSourcesKey())) {
+            qw.like("bc.independentSourcesKey", query.getIndependentSourcesKey());
+        }
+        //多媒体
+        if (StringUtils.isNotBlank(query.getMultimediaKey())) {
+            qw.like("bc.multimediaKey", query.getMultimediaKey());
+        }
         //常用配置
         if (StringUtils.isNotBlank(query.getConfigName())) {
             qw.like("bc.configName", query.getConfigName());
@@ -391,9 +447,13 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         if (StringUtils.isNotBlank(query.getModelSid())) {
             qw.eq("bvc.modelSid", query.getModelSid());
         }
+        //配置sid
+        if (StringUtils.isNotBlank(query.getConfigSid())) {
+            qw.eq("bc.sid", query.getConfigSid());
+        }
         //分公司
         if (StringUtils.isNotBlank(query.getUseOrg())) {
-            qw.eq("bvc.useOrg", query.getUseOrg());
+            qw.eq("bvc.useOrgSid", query.getUseOrg());
         }
         return qw;
     }
@@ -603,7 +663,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
                 qw.eq("bvm.suspension", pagerQuery.getSuspension());
             }
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getUseOrg())) {//分公司
-                qw.eq("bvc.useOrg", pagerQuery.getUseOrg());
+                qw.eq("bvc.useOrgSid", pagerQuery.getUseOrg());
             }
         }
         return qw;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basevehicle.*;
+import com.yxt.anrui.base.api.basevehicle.AppPurchaseDetailsVo;
 import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -215,6 +216,14 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      */
     IPage<BaseExistingCarListPageVo> selExistingCarPageList(IPage<BaseExistingCarPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<BaseExistingCarListPageVo> qw);
 
+    /**
+     * 根据车架号查询现车详情
+     *
+     * @param vinNo
+     * @return
+     */
+    AppPurchaseDetailsVo getPurchaseDetails(@Param("vinNo") String vinNo);
+
     /**
      * 手机端业务-车型报价-列表
      *

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -12,12 +12,12 @@
     <!--分页列表-->
     <select id="pagerList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
         SELECT bv.sid,
-               bv.modelName,
+        bv.modelName,
-               bv.vinNo,
+        bv.vinNo,
-               bv.engineNo,
+        bv.engineNo,
-               bv.vehicleStateValue,
+        bv.vehicleStateValue,
-               bv.location,
+        bv.location,
-               bv.libraryAge
+        bv.libraryAge
         FROM base_vehicle bv
         <where>
             ${ew.sqlSegment}
@@ -69,10 +69,10 @@
         <!--库龄（根据首次发车日期计算）-->
         bv.libraryAge
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid
+        LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid
-                 LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
+        LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
-                 LEFT JOIN anrui_portal.dict_common dc ON dc.dictKey = bv.vehicleState
+        LEFT JOIN anrui_portal.dict_common dc ON dc.dictKey = bv.vehicleState
-            ${ew.customSqlSegment}
+        ${ew.customSqlSegment}
     </select>
     <!--删除或批量删除车辆信息-->
     <delete id="deleteBySids" parameterType="java.util.List">
@@ -158,16 +158,16 @@
         bvm.isValidity,
         bvm.isValidityValue
         FROM base_vehicle_model bvm
-                 LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid
+        LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid
-                 LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
+        LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
-                 LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
+        LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
         WHERE bvm.sid = #{modelSid}
-          AND bmc.sid = #{modelConfigSid}
+        AND bmc.sid = #{modelConfigSid}
     </select>
     <!--导入车辆信息-->
     <insert id="saveList">
         INSERT INTO base_vehicle(sid, modelSid, modelConfigSid, vinNo, engineNo, manufactureDate, location,
-                                 vehicleState, firstStartDate, libraryAge)
+        vehicleState, firstStartDate, libraryAge)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
             (UUID(),<!--sid-->
@@ -196,8 +196,8 @@
     </select>
     <select id="selBySid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
         select bv.sid,
-               bv.modelSid,
+        bv.modelSid,
-               bv.modelConfigSid,
+        bv.modelConfigSid,
         <!--车架号(VIN)-->
         bv.vinNo,
         <!--发动机号/许可证号-->
@@ -256,13 +256,13 @@
     <select id="getAppCurrentCarByPageList"
             resultType="com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo">
         SELECT bvm.sid AS modelSid,
-               bvm.vehicleAlias,
+        bvm.vehicleAlias,
-               bvm.brandName,
+        bvm.brandName,
-               bvm.vehicleVersionValue,
+        bvm.vehicleVersionValue,
-               bvm.fuelTypeValue,
+        bvm.fuelTypeValue,
-               bvm.gearboxTypeValue
+        bvm.gearboxTypeValue
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
+        LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -349,7 +349,7 @@
                  LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
-          AND bvc.useOrg = #{useOrg}
+          AND bvc.useOrgSid = #{useOrg}
     </select>
 
     <select id="exiCarPagerList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleListVo">
@@ -373,9 +373,9 @@
         <!--配置Sid-->
         bv.modelConfigSid AS configSid
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
-                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
-            ${ew.customSqlSegment}
+        ${ew.customSqlSegment}
     </select>
 
     <select id="selectExiCarConfig" resultType="com.yxt.anrui.base.api.basevehicle.ExiCarConfigDetailVo">
@@ -419,7 +419,7 @@
                  LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
-          AND bvc.useOrg = #{useOrg}
+          AND bvc.useOrgSid = #{useOrg}
     </select>
     <select id="getBusDepositVehByVehSid" resultType="com.yxt.anrui.base.api.basevehicle.BusDepositVehListVo">
         SELECT bv.sid,
@@ -438,8 +438,8 @@
         <!--销售指导价-->
         bv.guidedPrice
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
-                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
         WHERE bv.sid = #{sid}
     </select>
 
@@ -476,29 +476,29 @@
         <!--配置Sid-->
         bv.modelConfigSid AS configSid
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
-                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
-            ${ew.customSqlSegment}
+        ${ew.customSqlSegment}
         ORDER BY
-            bv.priceDate desc
+        bv.priceDate desc
     </select>
 
     <select id="getModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppVehicleModelPriceVo">
-        SELECT bvm.sid                                                                                     AS modelSid,
+        SELECT bvm.sid AS modelSid,
-               bvm.vehicleAlias                                                                            AS modelName,
+        bvm.vehicleAlias AS modelName,
-               bvm.carBrand                                                                                AS brandSid,
+        bvm.carBrand AS brandSid,
-               bvm.brandName,
+        bvm.brandName,
-               bvm.vehicleVersionValue                                                                     AS versionValue,
+        bvm.vehicleVersionValue AS versionValue,
-               bvm.fuelTypeValue,
+        bvm.fuelTypeValue,
-               bvm.gearboxTypeValue,
+        bvm.gearboxTypeValue,
-               bvc.priceValidity,
+        bvc.priceValidity,
-               (SELECT count(*) FROM base_vehmodel_config WHERE bvc.modelSid = bvm.sid)                    AS configNum,
+        (SELECT count(*) FROM base_vehmodel_config WHERE bvc.modelSid = bvm.sid) AS configNum,
-               (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '0004') AS nowCarNum,
+        (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '0004') AS nowCarNum,
-               (SELECT count(*)
+        (SELECT count(*)
-                FROM bus_vehicle_apply_detail bvad
+        FROM bus_vehicle_apply_detail bvad
-                WHERE bvad.vehicleSid = bvm.sid)                                                           AS produceCarNum
+        WHERE bvad.vehicleSid = bvm.sid) AS produceCarNum
         FROM base_vehicle_model bvm
-                 LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
+        LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -513,7 +513,7 @@
         FROM base_vehicle_model bvm
                  LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
         WHERE bvc.modelSid = #{modelSid}
-          AND bvc.useOrg != #{useOrg}
+          AND bvc.useOrgSid != #{useOrg}
     </select>
 
     <select id="getAppModelConfig"
@@ -540,7 +540,7 @@
                  LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
-          AND bvc.useOrg = #{useOrg}
+          AND bvc.useOrgSid = #{useOrg}
     </select>
 
     <select id="getNowModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseVehicleNowModelVo">
@@ -575,9 +575,9 @@
         bmc.configName,
         DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
-                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
-            ${ew.customSqlSegment}
+        ${ew.customSqlSegment}
     </select>
 
     <update id="updateByVinNo">
@@ -636,4 +636,15 @@
                  LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
             ${ew.customSqlSegment}
     </select>
+    <!--根据车架号查询现车详情-->
+    <select id="getPurchaseDetails" resultType="com.yxt.anrui.base.api.basevehicle.AppPurchaseDetailsVo">
+        select bv.sid,
+               bv.vinNo,
+               bv.vehicleStateValue,
+               bv.location,
+               bv.priceDate,
+               bv.guidedPrice
+        from base_vehicle bv
+        where bv.vinNo = #{vinNo}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -6,6 +6,7 @@ import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
+import com.yxt.anrui.base.api.basevehicle.AppPurchaseDetailsVo;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
@@ -290,6 +291,18 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return rb.success().setData(pv1);
     }
 
+    /**
+     * 根据车架号查询现车详情
+     *
+     * @param vinNo
+     * @return
+     */
+    @Override
+    public ResultBean<AppPurchaseDetailsVo> getPurchaseDetails(String vinNo) {
+        AppPurchaseDetailsVo vo = baseVehicleService.getPurchaseDetails(vinNo);
+        return new ResultBean<AppPurchaseDetailsVo>().success().setData(vo);
+    }
+
     /**
      * 采购退库选择车辆分页列表
      *

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -6,10 +6,13 @@ import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo;
 import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo;
 import com.yxt.anrui.base.api.basevehicle.*;
+import com.yxt.anrui.base.api.basevehicle.AppPurchaseDetailsVo;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService;
 import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService;
 import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
+import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@@ -61,6 +64,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     @Autowired
     private BaseTrailerService baseTrailerService;
 
+    @Autowired
+    private CommonAppendixService commonAppendixService;
+
     @Autowired
     private BaseVehicleAppendixService baseVehicleAppendixService;
 
@@ -487,8 +493,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      */
     public AppCurrentCarDetailConfigVo getAppCurrentCarDetailConfigVo(String modelSid, String configSid, String userSid) {
 
-        SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
+        String useOrg = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
-        String useOrg = data.getSid();
+
         AppCurrentCarDetailConfigVo configDetailVo = baseMapper.getAppModelConfig(modelSid, configSid, useOrg);
         //车型详细配置数据
         AppCurrentCarDetailVo currentCarVo = baseMapper.getAppCurrentCarDetailConfigVo(modelSid, configSid, useOrg);
@@ -661,7 +667,11 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
         IPage<BaseExistingCarPageQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<BaseExistingCarListPageVo> qw = existingCarBuildQW(pagerQuery.getParams());
-        return baseMapper.selExistingCarPageList(page, qw);
+        IPage<BaseExistingCarListPageVo> baseExistingCarListPageVoIPage = baseMapper.selExistingCarPageList(page, qw);
+        for (BaseExistingCarListPageVo record : baseExistingCarListPageVoIPage.getRecords()) {
+            record.setCertificate("虚拟/正式");
+        }
+        return baseExistingCarListPageVoIPage;
     }
 
     /**
@@ -700,6 +710,29 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         return qw;
     }
 
+    /**
+     * 根据车架号查询现车详情
+     *
+     * @param vinNo
+     * @return
+     */
+    public AppPurchaseDetailsVo getPurchaseDetails(String vinNo) {
+        AppPurchaseDetailsVo vo = baseMapper.getPurchaseDetails(vinNo);
+        String sid = vo.getSid();
+        List<String> vehicleImages = new ArrayList<>();
+        List<CommonAppendixVo> list = commonAppendixService.selByLinkSid(sid);
+        if (list.size() > 0) {
+            for (CommonAppendixVo commonAppendixVo : list) {
+                String url = fileUploadComponent.getUrlPrefix() + commonAppendixVo.getFilePath();
+                vehicleImages.add(url);
+            }
+        }
+        vo.setVehicleImages(vehicleImages);
+        vo.setVehicleLabel("热卖");
+        vo.setPromotionPolicy("机油五桶、保养三次");
+        return vo;
+    }
+
     /**
      * 手机端业务-车型报价-列表
      *
@@ -763,7 +796,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             qw.eq("bvm.power", pagerQuery.getHorsepower());
         }
         if (StringUtils.isNotBlank(pagerQuery.getUseOrg())) { // 分公司
-            qw.eq("bvc.useOrg", pagerQuery.getUseOrg());
+            qw.eq("bvc.useOrgSid", pagerQuery.getUseOrg());
         }
         return qw;
     }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml

@@ -373,7 +373,7 @@
 
     <select id="notTheCompanyModelPageList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelListVo">
         SELECT
-        ( SELECT count( * ) FROM base_vehicle bv WHERE bv.modelSid = bm.sid and bv.useOrg = bvc.useOrg) AS nowCarNum,
+        ( SELECT count( * ) FROM base_vehicle bv WHERE bv.modelSid = bm.sid and bv.useOrg = bvc.useOrgSid) AS nowCarNum,
         ( SELECT count( * ) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bm.sid ) AS productionCarNum
         FROM
         base_vehicle_model bm

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java

@@ -367,9 +367,29 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getFuelType())) {
             qw.eq("bm.fuelType", query.getFuelType());
         }
+        //排放标准
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getEmissionStandard())) {
+            qw.eq("bm.emissionStandard", query.getEmissionStandard());
+        }
+        //发动机型号
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getEngineType())) {
+            qw.eq("bm.engineType", query.getEngineType());
+        }
+        //细分市场
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getMarketSegments())) {
+            qw.eq("bm.marketSegments", query.getMarketSegments());
+        }
+        //规格型号
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getSpecifications())) {
+            qw.eq("bm.specifications", query.getSpecifications());
+        }
+        //变速箱
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getGearboxType())) {
+            qw.eq("bm.gearboxType", query.getGearboxType());
+        }
         //判断不是本公司的
         if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getUseOrg())) {
-            qw.eq("bm.useOrg", query.getUseOrg());
+            qw.eq("bvc.useOrgSid", query.getUseOrg());
         }
         return qw;
     }
@@ -386,6 +406,13 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getUseOrg())) {
             qw.ne("bm.useOrg", query.getUseOrg());
         }
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getModelSid())) {
+            qw.ne("bm.sid", query.getModelSid());
+        }
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getConfigSid())) {
+            qw.ne("bvc.configSid", query.getConfigSid());
+        }
+
         return qw;
     }
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBusDetailsVo.java

@@ -35,7 +35,7 @@ public class AppBusDepositBusDetailsVo implements Vo {
     private String payTypeValue;
 
     @ApiModelProperty("付款方式")
-    private String payType;
+    private String payTypeKey;
 
     @ApiModelProperty("收款账号")
     private String collectionNumber;
@@ -64,4 +64,23 @@ public class AppBusDepositBusDetailsVo implements Vo {
     @ApiModelProperty("客户列表")
     private List<AppBusDepositCustomerListVo> customerList;
 
+    @ApiModelProperty("任务id")
+    private String taskId;
+
+    @ApiModelProperty("流程实例ID")
+    private String procInsId;
+
+    @ApiModelProperty("付款账号")
+    private String payNumber;
+
+    @ApiModelProperty("收款银行")
+    private String collectionBank;
+
+    @ApiModelProperty("收款银行")
+    private String collectionBankKey;
+
+    @ApiModelProperty("收款银行账号")
+    private String collectionNumberKey;
+
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java

@@ -21,7 +21,7 @@ public class AppBusDepositBuscenterDetailVo implements Vo {
     @ApiModelProperty("付款人")
     private String payName;
 
-    @ApiModelProperty("车辆台数")
+    @ApiModelProperty("预定数量")
     private String carNumber;
 
     @ApiModelProperty("订金金额")
@@ -33,6 +33,18 @@ public class AppBusDepositBuscenterDetailVo implements Vo {
     @ApiModelProperty("付款方式")
     private String payTypeValue;
 
+    @ApiModelProperty("付款方式")
+    private String payType;
+
+    @ApiModelProperty("付款账号")
+    private String payNumber;
+
+    @ApiModelProperty("创建日期")
+    private String createDate;
+
+    @ApiModelProperty("收款银行")
+    private String collectionBank;
+
     @ApiModelProperty("收款账号")
     private String collectionNumber;
 
@@ -54,9 +66,6 @@ public class AppBusDepositBuscenterDetailVo implements Vo {
     @ApiModelProperty("部门名称")
     private String departmentName;
 
-    @ApiModelProperty("跟新状态地址")
-    private String updateStateUrl;
-
     @ApiModelProperty("客户列表")
     private List<AppBusDepositCustomerListVo> customerList;
 

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

@@ -26,7 +26,7 @@ public class AppBusDepositBuscenterDto implements Dto {
     private String payTypeValue;
 
     @ApiModelProperty("付款方式key")
-    private String payType;
+    private String payTypeKey;
 
     @ApiModelProperty("付款日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@@ -53,4 +53,23 @@ public class AppBusDepositBuscenterDto implements Dto {
     @ApiModelProperty("客户列表")
     private List<AppBusDepositCustomerListDto> customerList;
 
+    @ApiModelProperty("任务Id")
+    private String taskId;
+
+    @ApiModelProperty("流程实例ID")
+    private String procInsId;
+
+    @ApiModelProperty("付款账号")
+    private String payNumber;
+
+    @ApiModelProperty("收款银行")
+    private String collectionBank;
+
+    @ApiModelProperty("收款银行")
+    private String collectionBankKey;
+
+    @ApiModelProperty("收款银行账号")
+    private String collectionNumberKey;
+
+
 }

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

@@ -59,4 +59,7 @@ public class AppBusMainDepositQuery implements Query {
     @ApiModelProperty(value = "name")
     private String name;
 
+    @ApiModelProperty(value = "业务员sid")
+    private String staffSid;
+
 }

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

@@ -49,6 +49,12 @@ import lombok.Data;
 @Data
 public class AppBusMainDepositVo implements Vo {
 
+    @ApiModelProperty(value = "虚拟订单类型（01:订金收取,02:车辆预订）")
+    private String virtualOrderType;
+
+    @ApiModelProperty(value = "虚拟订单状态")
+    private String virtualOrderState;
+
     @ApiModelProperty(value = "虚拟订单Sid")
     private String virtualOrderSid;
 
@@ -58,6 +64,9 @@ public class AppBusMainDepositVo implements Vo {
     @ApiModelProperty(value = "制单日期")
     private String virtualOrderDate;
 
+    @ApiModelProperty(value = "客户名称")
+    private String customerSid;
+
     @ApiModelProperty(value = "客户名称")
     private String customerName;
 
@@ -67,37 +76,25 @@ public class AppBusMainDepositVo implements Vo {
     @ApiModelProperty(value = "付款人")
     private String payName;
 
-    @ApiModelProperty(value = "备注")
-    private String remarks;
-
     @ApiModelProperty(value = "车辆台数")
     private String carNumber;
 
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
     @ApiModelProperty(value = "描述 (01时传值，02传空字符串)")
     private String describe;
 
-    @ApiModelProperty(value = "是否显示删除")
+    @ApiModelProperty(value = "是否显示删除 只要走流程了就不显示了")
     private boolean showDeleteBtn;
 
-    @ApiModelProperty(value = "是否显示修改")
+    @ApiModelProperty(value = "是否显示修改 只要走流程了就不显示了")
     private boolean showUpdateBtn;
 
-    @ApiModelProperty(value = "虚拟订单状态")
+    @ApiModelProperty(value = "是否显示使用订金记录 有使用记录时才显示（订金收取时才有）")
-    private String virtualOrderState;
-
-    @ApiModelProperty(value = "虚拟订单类型（01:订金收取,02:车辆预订）")
-    private String virtualOrderType;
-
-    @ApiModelProperty(value = "是否显示使用订金记录")
     private boolean showDepositBtn;
 
-    @ApiModelProperty(value = "是否显示申请收款单")
+    @ApiModelProperty(value = "是否显示申请收款单 流程状态为 收款确认 时显示")
     private boolean showApplyBtn;
 
-    @ApiModelProperty(value = "联系电话")
-    private String mobile;
-
-    @ApiModelProperty(value = "审核节点状态")
-    private String nodeState;
-
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempMaintainStateVo.java

@@ -26,6 +26,9 @@ public class AppCrmCustomerTempMaintainStateVo implements Vo {
     @ApiModelProperty("车辆需求：0、未完善1、已完善")
     private int vehicleDemandState;
 
+    @ApiModelProperty("客户档案：0、未完善1、已完善")
+    private int customerArchivesState;
+
     @ApiModelProperty("维系提醒：0、不开启1、已开启")
     private int isOnRemind;
 

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandVo.java

@@ -26,10 +26,10 @@ public class AppCrmVehicledemandVo implements Vo {
     private String createTime;
 
     @ApiModelProperty("销售指导价")
-    private String guidancePrice;
+    private String vehicleModelOffer;
 
     @ApiModelProperty("购车方式value")
-    private String purchaseType;
+    private String purchaseMethod;
 
 
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.java

@@ -68,6 +68,15 @@ public interface CrmCustomerFileMapper extends BaseMapper<CrmCustomerFile> {
 
     List<AppCustomerArchivesDataVo> selectByCustomerSid(@Param("customerSid") String customerSid);
 
+    /**
+     * 手机端维护客户信息是否完善的状态
+     * 查询客户档案状态
+     *
+     * @param customerSid
+     * @return
+     */
+    List<CrmCustomerFileVo> selectByCustomerSidState(@Param("customerSid") String customerSid);
+
     List<CrmFile> selArchivesFileImageBySid(@Param("sid") String sid);
 
     // 查询数据库是否存在该类型

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml

@@ -43,4 +43,10 @@
         where ccf.linkSid = #{sid}
     </select>
 
+    <select id="selectByCustomerSidState" resultType="com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileVo">
+        SELECT *
+        FROM crm_customer_file ccf
+        WHERE ccf.linkSid = #{customerSid}
+    </select>
+
 </mapper>

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java

@@ -282,5 +282,14 @@ public class CrmCustomerFileService extends MybatisBaseService<CrmCustomerFileMa
         return rb.success();
     }
 
-
+    /**
+     * 手机端维护客户信息是否完善的状态
+     * 查询客户档案状态
+     *
+     * @param sid
+     * @return
+     */
+    public List<CrmCustomerFileVo> selectByCustomerSidState(String sid) {
+        return baseMapper.selectByCustomerSidState(sid);
+    }
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -10,12 +10,14 @@ import com.yxt.anrui.base.api.commonappendix.PcCommonAppendixDto;
 import com.yxt.anrui.crm.api.crmbusiness.AppCrmBusinessInfoVo;
 import com.yxt.anrui.crm.api.crmbusiness.CrmBusinessDto;
 import com.yxt.anrui.crm.api.crmbusiness.CrmBusinessVo;
+import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileVo;
 import com.yxt.anrui.crm.api.crmcustomertemp.*;
 import com.yxt.anrui.crm.api.crmfile.CrmFileAttachTypeEnum;
 import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmVehicledemandVo;
 import com.yxt.anrui.crm.api.crmvisit.AppCrmVisitThumbDetailsVo;
 import com.yxt.anrui.crm.api.crmvisit.PcCrmVisitAppendixDto;
 import com.yxt.anrui.crm.biz.crmbusiness.CrmBusinessService;
+import com.yxt.anrui.crm.biz.crmcustomerfile.CrmCustomerFileService;
 import com.yxt.anrui.crm.biz.crmfile.CrmFileService;
 import com.yxt.anrui.crm.biz.crmvehicledemand.CrmVehicledemandService;
 import com.yxt.anrui.crm.biz.crmvisit.CrmVisitService;
@@ -69,6 +71,9 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
     @Autowired
     private CrmVehicledemandService crmVehicledemandService;
 
+    @Autowired
+    CrmCustomerFileService crmCustomerFileService;
+
     @Autowired
     private DictCommonFeign dictCommonFeign;
 
@@ -304,6 +309,13 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
             } else {
                 vo.setOperationSituationState(1);
             }
+            // 客户档案
+            List<CrmCustomerFileVo> crmCustomerFileVos = crmCustomerFileService.selectByCustomerSidState(sid);
+            if (crmCustomerFileVos.size() <= 0) {
+                vo.setOperationSituationState(0);
+            } else {
+                vo.setOperationSituationState(1);
+            }
             //意向车型
             List<AppCrmVehicledemandVo> appCrmVehicledemandVos = crmVehicledemandService.selectCustomerSid(sid);
             if (appCrmVehicledemandVos.size() > 0) {

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml

@@ -28,7 +28,7 @@
                cvcd.comonConfigSid,
                cvcd.vehicleModelOffer,
                cvcd.createTime,
-               cvcd.purchaseMethodValue
+               cvcd.purchaseMethodValue AS purchaseMethod
         FROM crm_customer_temp cct
                  LEFT JOIN crm_vehicledemand cvcd ON cct.sid = cvcd.customerSid
         WHERE cct.sid = #{sid}