From 6b29015662855b938e0d68636ae6db96dc88fdb6 Mon Sep 17 00:00:00 2001 From: hanlinghao <2969694837@qq.com> Date: Fri, 20 May 2022 16:09:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E6=8A=A5=E4=BB=B7=EF=BC=8C?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseModelConfigService.java | 22 +++++++++----- .../biz/basevehicle/BaseVehicleMapper.xml | 3 +- .../biz/basevehicle/BaseVehicleService.java | 30 ++++++++++++------- .../BaseVehicleAppendixService.java | 4 +++ .../AppCrmVehicledemandVo.java | 5 ++-- .../crmvehicledemand/CrmVehicledemand.java | 2 +- .../CrmVehicledemandMapper.java | 2 ++ .../CrmVehicledemandMapper.xml | 14 +++++++-- .../CrmVehicledemandService.java | 9 ++++-- .../crm/biz/crmvisit/CrmVisitMapper.java | 4 +-- .../anrui/crm/biz/crmvisit/CrmVisitMapper.xml | 9 ++---- .../crm/biz/crmvisit/CrmVisitService.java | 6 ++++ 12 files changed, 74 insertions(+), 36 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java index 3ccb3f88e8..67d21f604d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java +++ b/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.AppCurrentCarModelByPageListVo; -import com.yxt.anrui.base.api.basevehicle.AppMoreConfigVo; -import com.yxt.anrui.base.api.basevehicle.ConfigInfo; +import com.yxt.anrui.base.api.basevehicle.*; +import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendix; +import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService; +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 modelImages = new ArrayList<>(); - modelImages.add("123123"); - modelImages.add("324"); - modelImages.add("345"); + String type = "0002"; + String path = fileUploadComponent.getUrlPrefix(); + List modelImages = baseVehicleAppendixService.selectBySid(type, modelSid, path); vo.setModelImage(modelImages); //基础配置拼接 diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index ef103cd1aa..2de315cbde 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/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(*) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 1cac5b726e..29b9940de2 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/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 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 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 moreConfigVos = baseMapper.getCompanyModelList(record.getModelSid(), useOrg); for (AppMoreConfigVo moreConfigVo : moreConfigVos) { @@ -767,31 +777,31 @@ public class BaseVehicleService extends MybatisBaseService { * @return */ IPage getWantCarList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + void updateByPrice(@Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml index aedcc769b9..6a54e4c4e5 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml +++ b/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} + + + update + crm_vehicledemand + set vehicleModelOffer = NULL + where sid = #{sid} + + \ No newline at end of file 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 c9f1feef8f..3e79660782 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 @@ -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 { List 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); } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.xml index afc42f59e2..b75e693b5f 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.xml @@ -57,7 +57,7 @@ cv.remind_day, cv.remind_day_key FROM crm_visit cv - LEFT JOIN crm_customer_temp cct ON cct.sid = cv.customerSid + LEFT JOIN crm_customer_temp cct ON cct.sid = cv.customerSid where cv.sid = #{sid} @@ -99,11 +99,8 @@