rk
3 天以前 568e38a95cb6fb20fe16b53d17f610aefc6f744f
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
@@ -38,6 +38,7 @@
import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.TimeUnit;
/**
 * 车辆信息表Service实现
@@ -108,9 +109,9 @@
        model.setCreateDate(new Date());
        model.setCreator(loginUserInfo.getId());
        model.setEditDate(new Date());
        model.setIsdeleted(Constants.ZERO);
        model.setEdirot(loginUserInfo.getId());
        model.setStatus(Constants.ZERO);
        model.setIsdeleted(Constants.ZERO);
        model.setHkStatus(Constants.ZERO);
        model.setAuthStatus(Constants.ZERO);
        model.setRemark("");
@@ -355,10 +356,26 @@
    @Override
    public List<Cars> findList(Cars cars) {
        if(Objects.nonNull(cars)
        && Constants.equalsInteger(Constants.ZERO,cars.getType())){
            return this.getGwCar();
        }
        cars.setType(null);
        QueryWrapper<Cars> wrapper = new QueryWrapper<>(cars);
        wrapper.lambda().eq(Cars::getIsdeleted,Constants.ZERO);
        return carsMapper.selectList(wrapper);
    }
    public List<Cars> getGwCar(){
        List<Cars> list  = carsMapper.selectJoinList(Cars.class,
                new MPJLambdaWrapper<Cars>().selectAll(Cars.class)
                        .leftJoin(Category.class,Category::getId,Cars::getCateId)
                        .eq(Category::getBizType,Constants.FOUR)
                        .eq(Cars::getIsdeleted,Constants.ZERO)
        );
        return list;
    }
    @Override
    public PageData<Cars> findPage(PageWrap<Cars> pageWrap) {
@@ -494,7 +511,7 @@
        if(importing!=null && importing){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起,已存在车辆导入任务正在执行中,请稍后再试!");
        }
        redisTemplate.opsForValue().set(Constants.RedisKeys.IMPORTING_CARS,true);
        redisTemplate.opsForValue().set(Constants.RedisKeys.IMPORTING_CARS,true,30, TimeUnit.MINUTES);
        try {
            ExcelImporter ie = null;
            List<CarsImport> dataList =null;