|
|
|
@ -3,6 +3,9 @@ package com.yxt.anrui.base.biz.basevehiclemodel; |
|
|
|
import cn.hutool.core.bean.BeanUtil; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig; |
|
|
|
import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigSelectVo; |
|
|
|
import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigVo; |
|
|
|
import com.yxt.anrui.base.api.basemodelconfig.PcChooseBaseModelConfigVo; |
|
|
|
import com.yxt.anrui.base.api.basemodelszconfig.BaseModelSzconfigVo; |
|
|
|
@ -12,9 +15,12 @@ import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendix; |
|
|
|
import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixDto; |
|
|
|
import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixQuery; |
|
|
|
import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixVo; |
|
|
|
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo; |
|
|
|
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.basevehiclemodelappendix.BaseVehicleModelAppendixService; |
|
|
|
import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService; |
|
|
|
import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemand; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrgVo; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrganization; |
|
|
|
@ -34,6 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
import javax.validation.constraints.NotBlank; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.Arrays; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
@ -57,13 +64,13 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel |
|
|
|
@Autowired |
|
|
|
private SysOrganizationFeign sysOrganizationFeign; |
|
|
|
@Autowired |
|
|
|
private BaseModelSzconfigService baseModelSzconfigService; |
|
|
|
@Autowired |
|
|
|
private BaseTrailerService baseTrailerService; |
|
|
|
@Autowired |
|
|
|
private FileUploadComponent fileUploadComponent; |
|
|
|
@Autowired |
|
|
|
private BaseVehicleModelAppendixService baseVehicleModelAppendixService; |
|
|
|
@Autowired |
|
|
|
private BaseVehmodelConfigService baseVehmodelConfigService; |
|
|
|
@Autowired |
|
|
|
private BaseModelConfigService baseModelConfigService; |
|
|
|
|
|
|
|
/** |
|
|
|
* 车型信息分页列表 |
|
|
|
@ -87,6 +94,12 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel |
|
|
|
QueryWrapper<BaseVehicleModelVo> qw = new QueryWrapper<>(); |
|
|
|
if (pagerQuery != null) { |
|
|
|
qw.eq("bvm.isDelete", "0"); |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getModelSid())) {//车型sid
|
|
|
|
qw.eq("bvm.sid", pagerQuery.getModelSid()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getCarBrand())) {//品牌sid
|
|
|
|
qw.eq("bvm.carBrand", pagerQuery.getCarBrand()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getCarBrand())) {//品牌sid
|
|
|
|
qw.eq("bvm.carBrand", pagerQuery.getCarBrand()); |
|
|
|
} |
|
|
|
@ -154,10 +167,20 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel |
|
|
|
} |
|
|
|
baseVehicleModelDetailsVo.setUseOrg(s); |
|
|
|
} |
|
|
|
PcChooseBaseModelConfigVo pcChooseBaseModelConfigVo = this.getPcChooseListByModelSid(sid); |
|
|
|
BaseModelConfigVo baseModelConfigVo = new BaseModelConfigVo(); |
|
|
|
BeanUtil.copyProperties(pcChooseBaseModelConfigVo, baseModelConfigVo); |
|
|
|
baseVehicleModelDetailsVo.setBaseModelConfigVo(baseModelConfigVo != null ? baseModelConfigVo : new BaseModelConfigVo()); |
|
|
|
List<BaseModelConfigVo> baseModelConfigVos = new ArrayList<>(); |
|
|
|
|
|
|
|
List<BaseVehmodelConfigVo> baseVehmodelConfigVos = baseVehmodelConfigService.getVehModByModelSid(sid); |
|
|
|
if (baseVehmodelConfigVos.size() > 0){ |
|
|
|
for (BaseVehmodelConfigVo baseVehmodelConfigVo : baseVehmodelConfigVos) { |
|
|
|
BaseModelConfigVo baseModelConfigVo = new BaseModelConfigVo(); |
|
|
|
String configurationItemsSid = baseVehmodelConfigVo.getConfigurationItemsSid(); |
|
|
|
BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(configurationItemsSid); |
|
|
|
BeanUtil.copyProperties(baseModelConfig, baseModelConfigVo); |
|
|
|
baseModelConfigVo.setGuidedPrice(baseVehmodelConfigVo.getGuidedPrice()); |
|
|
|
baseModelConfigVos.add(baseModelConfigVo); |
|
|
|
} |
|
|
|
baseVehicleModelDetailsVo.setBaseModelConfigVo(baseModelConfigVos); |
|
|
|
} |
|
|
|
return baseVehicleModelDetailsVo; |
|
|
|
} |
|
|
|
|
|
|
|
@ -549,4 +572,30 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel |
|
|
|
} |
|
|
|
return qw; |
|
|
|
} |
|
|
|
|
|
|
|
public IPage<BaseVehicleModelVo> selectVehModelByConfigSid(PagerQuery<BaseVehicleModelQuery> pagerQuery) { |
|
|
|
List<BaseVehicleModelVo> baseVehicleModelVos = new ArrayList<>(); |
|
|
|
IPage<BaseVehicleModelVo> baseVehicleModelVo = new Page<>(); |
|
|
|
BaseVehicleModelQuery params = pagerQuery.getParams(); |
|
|
|
IPage<BaseVehicleModelQuery> page = PagerUtil.queryToPage(pagerQuery); |
|
|
|
QueryWrapper<BaseVehicleModelVo> qw = buildQueryWrapper(params); |
|
|
|
List<BaseVehmodelConfigVo> baseVehmodelConfigVos = baseVehmodelConfigService.getListByConfigSid(params.getConfigSid()); |
|
|
|
for (BaseVehmodelConfigVo baseVehmodelConfigVo : baseVehmodelConfigVos) { |
|
|
|
String modelSid = baseVehmodelConfigVo.getModelSid(); |
|
|
|
params.setModelSid(modelSid); |
|
|
|
IPage<BaseVehicleModelVo> baseVehicleModelVoIPage = baseMapper.pagerList(page, qw); |
|
|
|
List<BaseVehicleModelVo> records = baseVehicleModelVoIPage.getRecords(); |
|
|
|
for (BaseVehicleModelVo record : records) { |
|
|
|
record.setConfigSid(params.getConfigSid()); |
|
|
|
baseVehicleModelVos.add(record); |
|
|
|
} |
|
|
|
baseVehicleModelVo.setPages(baseVehicleModelVoIPage.getPages()); |
|
|
|
baseVehicleModelVo.setCurrent(baseVehicleModelVoIPage.getCurrent()); |
|
|
|
baseVehicleModelVo.setSize(baseVehicleModelVoIPage.getSize()); |
|
|
|
baseVehicleModelVo.setTotal(baseVehicleModelVoIPage.getTotal()); |
|
|
|
baseVehicleModelVo.setRecords(baseVehicleModelVos); |
|
|
|
} |
|
|
|
|
|
|
|
return baseVehicleModelVo; |
|
|
|
} |
|
|
|
} |
God
3 years ago