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

doum

3 天以前 48d06fac940e6f28d599eb7fbf05c2cce41ecb30

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

@@ -2,16 +2,16 @@

import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CarsMapper;
import com.doumee.dao.business.ParkBookMapper;
import com.doumee.dao.business.ParksMapper;
import com.doumee.dao.business.join.ParkBookJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.ParkBookService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -29,7 +29,6 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;

/**
 * 车辆预约记录信息表Service实现
@@ -121,6 +120,7 @@
       }
        hkSyncParkService.syncParkBookBySingleModel(model);
    }

    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public   String batchAuth(Cars cars) {
@@ -180,7 +180,7 @@
           model.setAuthTimeType(cars.getAuthTimeType());
           model.setStartTime(startTime);
           model.setEndTime(endTime);
           dealCarAuthByModel(model,cars.getLoginUserInfo(),parksList,date);
           dealCarAuthByModel(model,cars.getLoginUserInfo().getId(),parksList,date,parkBookMapper);
           model.setAuthStatus(Constants.ONE);//已授权
           carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
                   .eq(Cars::getId,model.getId())
@@ -195,7 +195,7 @@

    }

    private int dealCarAuthByModel(Cars model, LoginUserInfo loginUserInfo, List<Parks> parksList,Date date) {
    public static int dealCarAuthByModel(Cars model, Integer userId, List<Parks> parksList,Date date,ParkBookMapper parkBookMapper) {
        //删除车量库记录数据
        parkBookMapper.update(null,new UpdateWrapper<ParkBook>().lambda()
                .eq(ParkBook::getCarCode,model.getCode())
@@ -208,8 +208,8 @@
                ParkBook parkBook = new ParkBook();
                parkBook.setIsdeleted(Constants.ZERO);
                parkBook.setCreateDate(date);
                parkBook.setCreator(loginUserInfo.getId());
                parkBook.setEditor(loginUserInfo.getId());
                parkBook.setCreator(userId);
                parkBook.setEditor(userId);
                parkBook.setEditDate(date);
                parkBook.setCarCode(model.getCode());
                parkBook.setParkId(parks.getId());
@@ -245,16 +245,25 @@
        MPJLambdaWrapper<ParkBook> queryWrapper = new MPJLambdaWrapper<>();

        queryWrapper.selectAll(ParkBook.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.selectAs(Parks::getName,ParkBook::getParksName);
        queryWrapper.selectAs(Member::getType,ParkBook::getMemberType);
        queryWrapper.selectAs(Member::getName,ParkBook::getMemberName);
        queryWrapper.selectAs(Member::getPhone,ParkBook::getMemberPhone);
        queryWrapper.selectAs(Company::getName,ParkBook::getCompanyName);

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

        LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();
        if(userInfo!=null && userInfo.getCompanyIdList()!=null){
            if( userInfo.getCompanyIdList().size() ==0){
                //只能看自己
                queryWrapper.eq(Member::getId,userInfo.getMemberId());
            }else{
                queryWrapper.in(Company::getId,userInfo.getCompanyIdList());
            }
        }
        //数据权限开始--------------------end----------------
        queryWrapper
//                .eq(ParkBook::getIsdeleted, Constants.ZERO)
          .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getPhone,pageWrap.getModel().getMemberName())