Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop

huanghongfa

2022-04-14 cb2b53c615599ae0ca50fbdaa2de83be047c94fe

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComChangeCarModelRelationServiceImpl.java

@@ -1,6 +1,9 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.vos.common.ComChangeCarModelRelationVo;
import com.panzhihua.common.model.vos.common.ComChangeCarModelVo;
import com.panzhihua.service_community.entity.ComChangeCarModelRelation;
import com.panzhihua.service_community.dao.ComChangeCarModelRelationMapper;
import com.panzhihua.service_community.service.ComChangeCarModelRelationService;
@@ -10,6 +13,8 @@
import com.panzhihua.common.model.vos.R;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import java.util.List;

/**
 * title: 换新车-车型与规格关联表表服务实现类
@@ -48,7 +53,7 @@
    @Override
    public R insert(AddComChangeCarModelRelationDto comChangeCarModelRelation) {
        ComChangeCarModelRelation entity = this.baseMapper.selectOne(new QueryWrapper<ComChangeCarModelRelation>().lambda()
                .eq(ComChangeCarModelRelation::getModelId,comChangeCarModelRelation.getModelSpecsId())
                .eq(ComChangeCarModelRelation::getModelId,comChangeCarModelRelation.getModelId())
                .eq(ComChangeCarModelRelation::getModelSpecsId,comChangeCarModelRelation.getModelSpecsId()));
        if(entity == null){
            entity = new ComChangeCarModelRelation();
@@ -142,6 +147,12 @@
     */
    @Override
    public R queryByAppletsPage(PageComChangeCarModelRelationDto comChangeCarModelRelation) {
        return R.ok(this.baseMapper.queryAllByAppletsLimit(comChangeCarModelRelation, new Page(comChangeCarModelRelation.getPageNum(), comChangeCarModelRelation.getPageSize())));
        IPage<ComChangeCarModelVo> carModelVoIPage = this.baseMapper.queryAllByAppletsLimit(comChangeCarModelRelation, new Page(comChangeCarModelRelation.getPageNum(), comChangeCarModelRelation.getPageSize()));
        carModelVoIPage.getRecords().forEach(carModel -> {
            //查询车型规格列表
            List<ComChangeCarModelRelationVo> carModelRelationVoList = this.baseMapper.queryAllByModelId(carModel.getId());
            carModel.setCarModelRelationList(carModelRelationVoList);
        });
        return R.ok(carModelVoIPage);
    }
}