Merge remote-tracking branch 'origin/master'

lishuai

2023-12-26 70577a6d6cf2bded29e71dcad11a0c2605193d20

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java

@@ -1,31 +1,46 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CarsMapper;
import com.doumee.dao.business.model.Cars;
import com.doumee.service.business.CarsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.CarsQuery;
import com.doumee.dao.admin.response.CarsDTO;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.CarsMapper;
import com.doumee.dao.business.join.CarJoinMapper;
import com.doumee.dao.business.join.ParkBookJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.CarsService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.List;
import java.util.Objects;

/**
 * 车辆信息表Service实现
 * @author 江蹄蹄
 * @date 2023/11/23 18:16
 * @date 2023/11/30 15:33
 */
@Service
public class CarsServiceImpl implements CarsService {

    @Autowired
    private CarsMapper carsMapper;

    @Autowired
    private CarJoinMapper carJoinMapper;

    @Autowired
    private ParkBookJoinMapper parkBookJoinMapper;

    @Override
    public Integer create(Cars cars) {
@@ -83,77 +98,36 @@
        QueryWrapper<Cars> wrapper = new QueryWrapper<>(cars);
        return carsMapper.selectList(wrapper);
    }
  

    @Override
    public PageData<Cars> findPage(PageWrap<Cars> pageWrap) {


        IPage<Cars> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<Cars> queryWrapper = new QueryWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(Cars::getId, pageWrap.getModel().getId());
        }
        if (pageWrap.getModel().getCreator() != null) {
            queryWrapper.lambda().eq(Cars::getCreator, pageWrap.getModel().getCreator());
        }
        if (pageWrap.getModel().getCreateDate() != null) {
            queryWrapper.lambda().ge(Cars::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
            queryWrapper.lambda().le(Cars::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
        }
        if (pageWrap.getModel().getEdirot() != null) {
            queryWrapper.lambda().eq(Cars::getEdirot, pageWrap.getModel().getEdirot());
        }
        if (pageWrap.getModel().getEditDate() != null) {
            queryWrapper.lambda().ge(Cars::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
            queryWrapper.lambda().le(Cars::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
        }
        if (pageWrap.getModel().getIsdeleted() != null) {
            queryWrapper.lambda().eq(Cars::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }
        if (pageWrap.getModel().getRemark() != null) {
            queryWrapper.lambda().eq(Cars::getRemark, pageWrap.getModel().getRemark());
        }
        if (pageWrap.getModel().getHkId() != null) {
            queryWrapper.lambda().eq(Cars::getHkId, pageWrap.getModel().getHkId());
        }
        if (pageWrap.getModel().getSortnum() != null) {
            queryWrapper.lambda().eq(Cars::getSortnum, pageWrap.getModel().getSortnum());
        }
        if (pageWrap.getModel().getCode() != null) {
            queryWrapper.lambda().eq(Cars::getCode, pageWrap.getModel().getCode());
        }
        if (pageWrap.getModel().getParkId() != null) {
            queryWrapper.lambda().eq(Cars::getParkId, pageWrap.getModel().getParkId());
        }
        if (pageWrap.getModel().getHkId2() != null) {
            queryWrapper.lambda().eq(Cars::getHkId2, pageWrap.getModel().getHkId2());
        }
        if (pageWrap.getModel().getHkStatus() != null) {
            queryWrapper.lambda().eq(Cars::getHkStatus, pageWrap.getModel().getHkStatus());
        }
        if (pageWrap.getModel().getHkDate() != null) {
            queryWrapper.lambda().ge(Cars::getHkDate, Utils.Date.getStart(pageWrap.getModel().getHkDate()));
            queryWrapper.lambda().le(Cars::getHkDate, Utils.Date.getEnd(pageWrap.getModel().getHkDate()));
        }
        if (pageWrap.getModel().getMemberId() != null) {
            queryWrapper.lambda().eq(Cars::getMemberId, pageWrap.getModel().getMemberId());
        }
        if (pageWrap.getModel().getMemberUserId() != null) {
            queryWrapper.lambda().eq(Cars::getMemberUserId, pageWrap.getModel().getMemberUserId());
        }
        if (pageWrap.getModel().getErpId() != null) {
            queryWrapper.lambda().eq(Cars::getErpId, pageWrap.getModel().getErpId());
        }
        if (pageWrap.getModel().getStatus() != null) {
            queryWrapper.lambda().eq(Cars::getStatus, pageWrap.getModel().getStatus());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(carsMapper.selectPage(page, queryWrapper));
        MPJLambdaWrapper<Cars> queryWrapper = new MPJLambdaWrapper<>();

        queryWrapper.selectAll(Cars.class);
        queryWrapper.selectAs(Parks::getName,Cars::getParksName);
        queryWrapper.selectAs(Member::getType,Cars::getMemberType);
        queryWrapper.selectAs(Member::getName,Cars::getMemberName);
        queryWrapper.selectAs(Member::getPhone,Cars::getMemberPhone);
        queryWrapper.selectAs(Company::getName,Cars::getCompanyName);

        queryWrapper.leftJoin(Parks.class,Parks::getId,Cars::getParkId);
        queryWrapper.leftJoin(Member.class,Member::getId,Cars::getMemberId);
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);


        queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
                .or().like(Member::getPhone,pageWrap.getModel().getMemberName()));
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName());
        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getMemberType()),Member::getType,pageWrap.getModel().getMemberType());
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCode()),Cars::getCode,pageWrap.getModel().getCode());
        queryWrapper.eq(Cars::getIsdeleted,Constants.ZERO);

        queryWrapper.orderByDesc(Cars::getCreateDate);
        IPage<Cars> result = carJoinMapper.selectJoinPage(page, Cars.class,queryWrapper);
        return PageData.from(result);
    }

    @Override
@@ -161,4 +135,30 @@
        QueryWrapper<Cars> wrapper = new QueryWrapper<>(cars);
        return carsMapper.selectCount(wrapper);
    }

    @Override
    public PageData<CarsDTO> findCarPage(PageWrap<CarsQuery> pageWrap) {
        MPJLambdaWrapper<ParkBook> wrapper = new MPJLambdaWrapper<>();
        IPage<Cars> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        Utils.MP.blankToNull(pageWrap.getModel());
        wrapper.leftJoin(Member.class,Member::getId,ParkBook::getMemberId)
                .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                .leftJoin(Parks.class,Parks::getId,ParkBook::getParkId);
        wrapper.selectAs(ParkBook::getCarCode,CarsDTO::getCode)
                .selectAs(ParkBook::getParkId,CarsDTO::getParkId)
                .selectAs(ParkBook::getRemark,CarsDTO::getRemark)
                .selectAs(Parks::getName,CarsDTO::getParkName)
                .selectAs(ParkBook::getMemberId,CarsDTO::getMemberId)
                .selectAs(Member::getName,CarsDTO::getMemberName)
                .selectAs(Member::getType,CarsDTO::getMemberType)
                .selectAs(Company::getName,CarsDTO::getCompanyName)
                .selectAs(ParkBook::getTimeType,CarsDTO::getTimeType)
                .selectAs(ParkBook::getStartTime,CarsDTO::getStartTime)
                .selectAs(ParkBook::getEndTime,CarsDTO::getEndTime)
                .selectAs(ParkBook::getCreateDate,CarsDTO::getCreateDate);
        wrapper.orderByDesc(ParkBook::getCreateDate);
        IPage<CarsDTO> carsDTOIPage = parkBookJoinMapper.selectJoinPage(page, CarsDTO.class, wrapper);

        return PageData.from(carsDTOIPage);
    }
}