车型报价，客户管理问题修改

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

@@ -3,12 +3,13 @@ package com.yxt.anrui.base.biz.basemodelconfig;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemodelconfig.*;
-import com.yxt.anrui.base.api.basevehicle.AppCurrentCarByPageListQuery;
+import com.yxt.anrui.base.api.basevehicle.*;
-import com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo;
+import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendix;
-import com.yxt.anrui.base.api.basevehicle.AppMoreConfigVo;
+import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
-import com.yxt.anrui.base.api.basevehicle.ConfigInfo;
+import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -39,6 +40,12 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
 
+    @Autowired
+    private BaseVehicleAppendixService baseVehicleAppendixService;
+
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+
     /**
      * 车型配置信息分页列表
      *
@@ -484,10 +491,9 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         }
         String modelSid = pagerQuery.getParams().getModelSid();
         AppModelConfigVo vo = baseMapper.getModelConfigList(modelSid);
-        List<String> modelImages = new ArrayList<>();
+        String type = "0002";
-        modelImages.add("123123");
+        String path = fileUploadComponent.getUrlPrefix();
-        modelImages.add("324");
+        List<String> modelImages = baseVehicleAppendixService.selectBySid(type, modelSid, path);
-        modelImages.add("345");
         vo.setModelImage(modelImages);
 
         //基础配置拼接

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

@@ -489,7 +489,8 @@
         bvm.fuelTypeValue,
         bvm.gearboxTypeValue,
         bvc.priceValidity,
-        bvc.guidedPrice,
+        (SELECT CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice)) FROM base_vehmodel_config bvc WHERE bvc.modelSid
+        = bvm.sid) AS guidedPrice,
         (SELECT count(*) FROM base_vehmodel_config bvc WHERE bvc.modelSid = bvm.sid) AS configNum,
         (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '03') AS nowCarNum,
         (SELECT count(*)

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

@@ -6,6 +6,7 @@ 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.basevehicleappendix.BaseVehicleAppendix;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
@@ -749,7 +750,16 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         IPage<AppVehicleModelPriceVo> iPage = baseMapper.getModelList(page, qw);
         // 3、 查询更多配置（其它分公司）
         for (AppVehicleModelPriceVo record : iPage.getRecords()) {
-            record.setModelImage("http//:192.168.1.101:8111/aaa.com");
+            String sid = record.getModelSid();
+            String type = "0002";
+            String path = fileUploadComponent.getUrlPrefix();
+            List<String> list = baseVehicleAppendixService.selectBySid(type, sid, path);
+            if (list.size() > 0) {
+                String s = list.get(0);
+                record.setModelImage(s);
+            }else {
+                record.setModelImage("");
+            }
             String useOrg = data.getSid();
             List<AppMoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(record.getModelSid(), useOrg);
             for (AppMoreConfigVo moreConfigVo : moreConfigVos) {
@@ -767,31 +777,31 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             qw.like("bvm.vehicleAlias", pagerQuery.getName());
         }
         if (StringUtils.isNotBlank(pagerQuery.getEmissionStandard())) { // 排放标准
-            qw.eq("bvm.emissionStandard", pagerQuery.getEmissionStandard());
+            qw.eq("bvm.emissionStandardValue", pagerQuery.getEmissionStandard());
         }
         if (StringUtils.isNotBlank(pagerQuery.getDriver())) { // 驱动
-            qw.eq("bvm.driveForm", pagerQuery.getDriver());
+            qw.eq("bvm.driveFormValue", pagerQuery.getDriver());
         }
         if (StringUtils.isNotBlank(pagerQuery.getGearbox())) { // 变速箱
-            qw.eq("bvm.gearboxType", pagerQuery.getGearbox());
+            qw.eq("bvm.gearboxTypeValue", pagerQuery.getGearbox());
         }
         if (StringUtils.isNotBlank(pagerQuery.getSeries())) { // 产品系别
-            qw.eq("bvm.department", pagerQuery.getSeries());
+            qw.eq("bvm.departmentValue", pagerQuery.getSeries());
         }
         if (StringUtils.isNotBlank(pagerQuery.getVehicleFunction())) { // 功能
-            qw.eq("bvm.vehicleType", pagerQuery.getVehicleFunction());
+            qw.eq("bvm.vehicleTypeValue", pagerQuery.getVehicleFunction());
         }
         if (StringUtils.isNotBlank(pagerQuery.getMarketSegments())) { // 细分市场
-            qw.eq("bvm.marketSegments", pagerQuery.getMarketSegments());
+            qw.eq("bvm.marketSegmentsValue", pagerQuery.getMarketSegments());
         }
         if (StringUtils.isNotBlank(pagerQuery.getVehicleVersion())) { // 版本
-            qw.eq("bvm.vehicleVersion", pagerQuery.getVehicleVersion());
+            qw.eq("bvm.vehicleVersionValue", pagerQuery.getVehicleVersion());
         }
         if (StringUtils.isNotBlank(pagerQuery.getFuelType())) { // 燃料
-            qw.eq("bvm.fuelType", pagerQuery.getFuelType());
+            qw.eq("bvm.fuelTypeValue", pagerQuery.getFuelType());
         }
         if (StringUtils.isNotBlank(pagerQuery.getHorsepower())) { // 马力
-            qw.eq("bvm.power", pagerQuery.getHorsepower());
+            qw.eq("bvm.powerValue", pagerQuery.getHorsepower());
         }
         if (StringUtils.isNotBlank(pagerQuery.getUseOrg())) { // 分公司
             qw.eq("bvc.useOrgSid", pagerQuery.getUseOrg());

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleappendix/BaseVehicleAppendixService.java

@@ -73,4 +73,8 @@ public class BaseVehicleAppendixService extends MybatisBaseService<BaseVehicleAp
     public int deletePath(String path) {
         return baseMapper.deletePath(path);
     }
+
+    public BaseVehicleAppendix selectByLinkSid(String modelSid, String type) {
+        return null;
+    }
 }

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

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

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

@@ -59,7 +59,7 @@ public class CrmVehicledemand extends BaseEntity {
     private String changeOptions;
 
     @ApiModelProperty("车型报价")
-    private String vehicleModelOffer;
+    private BigDecimal vehicleModelOffer;
 
     @ApiModelProperty("数量")
     private String number;

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

@@ -106,4 +106,6 @@ public interface CrmVehicledemandMapper extends BaseMapper<CrmVehicledemand> {
      * @return
      */
     IPage<AppOrderCrmVehicleDemandVo> getWantCarList(IPage<CrmVehicledemand> page, @Param(Constants.WRAPPER) QueryWrapper<CrmVehicledemand> qw);
+
+    void updateByPrice(@Param("sid") String sid);
 }

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

@@ -32,9 +32,9 @@
                cvcd.modelName,
                cvcd.modelSid,
                cvcd.comonConfigSid,
-               cvcd.saleReferencePrice  AS vehicleModelOffer,
+               cvcd.saleReferencePrice  AS guidancePrice,
                cvcd.createTime,
-               cvcd.purchaseMethodValue AS purchaseMethod
+               cvcd.purchaseMethodValue AS purchaseType
         FROM crm_vehicledemand cvcd
         WHERE cvcd.customerSid = #{customerSid}
           AND cvcd.states = 1
@@ -107,7 +107,7 @@
             resultType="com.yxt.anrui.crm.api.crmvehicledemand.AppCrmVehicleDemandParticularsVo">
         SELECT cv.purchaseMethodValue AS type,
                cv.modelSid,
-               cv.modelName           AS model,
+               cv.modelName,
                cv.brandName           AS brand,
                cv.saleReferencePrice  AS price,
                cv.vehicleModelOffer   AS quotation,
@@ -136,4 +136,12 @@
                cv.createTime
         from crm_vehicledemand cv ${ew.customSqlSegment}
     </select>
+
+    <update id="updateByPrice">
+        update
+            crm_vehicledemand
+        set vehicleModelOffer = NULL
+        where sid = #{sid}
+    </update>
+
 </mapper>

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

@@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -355,11 +356,13 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
         entity.setNumber(appCrmVehicleDemandUpdateDto.getNumber());
         entity.setEstimatedPickupDate(appCrmVehicleDemandUpdateDto.getDate());
         if (StringUtils.isNotBlank(appCrmVehicleDemandUpdateDto.getPrice())) {
-            entity.setVehicleModelOffer(appCrmVehicleDemandUpdateDto.getPrice());
+            BigDecimal bigDecimal = new BigDecimal(appCrmVehicleDemandUpdateDto.getPrice());
-        } else {
+            entity.setVehicleModelOffer(bigDecimal);
-            entity.setVehicleModelOffer("0.00");
         }
         baseMapper.updateById(entity);
+        if (StringUtils.isBlank(appCrmVehicleDemandUpdateDto.getPrice())) {
+           baseMapper.updateByPrice(entity.getSid());
+        }
         return rb.success();
     }
 

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.java

@@ -66,8 +66,8 @@ public interface CrmVisitMapper extends BaseMapper<CrmVisit> {
 
     List<String> selVisitMaterials(@Param("sid") String sid, @Param("staffSid") String staffSid);
 
-    int fetchByVisitSid(String sid);
+    int fetchByVisitSid(@Param("sid") String sid);
 
     @Update("UPDATE crm_visit SET visit_witness_materials = #{s} WHERE sid = #{sid}")
-    void updateAppendixUrl(@Param("s")String s,@Param("sid")String sid);
+    void updateAppendixUrl(@Param("s") String s, @Param("sid") String sid);
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.xml

@@ -99,11 +99,8 @@
     </select>
     <select id="fetchByVisitSid" resultType="java.lang.Integer">
         SELECT count(*)
-        FROM crm_visit cv
+        FROM crm_visit_demand cvd
-                 LEFT JOIN crm_visit_demand cvd ON cv.sid = cvd.visitSid
+        WHERE cvd.visitSid = #{sid}
-                 LEFT JOIN crm_vehicledemand cvcd ON cvcd.sid = cvd.demandSid
-        WHERE cv.sid = #{sid}
-          AND cvcd.states = 0
     </select>
     <select id="getAppVisitByCustomerSid"
             resultType="com.yxt.anrui.crm.api.crmvisit.AppCrmVisitThumbDetailsVo">

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitService.java

@@ -349,6 +349,12 @@ public class CrmVisitService extends MybatisBaseService<CrmVisitMapper, CrmVisit
                 String format = new SimpleDateFormat("yyyy年MM月dd日").format(date);
                 appCrmVisitThumbDetailsVo.setFollow_time(format + "  " + DateUtils.getWeekOfDate(date));
             }
+            int i = baseMapper.fetchByVisitSid(appCrmVisitThumbDetailsVo.getSid());
+            if (i > 0) {
+                appCrmVisitThumbDetailsVo.setIntendedModel(true);
+            } else {
+                appCrmVisitThumbDetailsVo.setIntendedModel(false);
+            }
 //            if (StringUtils.isNotBlank(appCrmVisitThumbDetailsVo.getVisit_witness_materials())) {
 //                String[] urlArr = appCrmVisitThumbDetailsVo.getVisit_witness_materials().split(",");
 //                for (int i = 0; i < urlArr.length; i++) {