productDev/dmvisit.git

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

			import com.doumee.core.haikang.model.HKConstants;
			import com.doumee.core.model.PageData;
			import com.doumee.core.model.PageWrap;
			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.admin.response.CarEventDTO;
			@@ -10,6 +10,7 @@
			import com.doumee.dao.business.join.CarEventJoinMapper;
			import com.doumee.dao.business.model.*;
			import com.doumee.dao.business.vo.CarEventVo;
			import com.doumee.dao.business.model.Member;
			import com.doumee.dao.system.SystemDictDataMapper;
			import com.doumee.dao.system.model.SystemDictData;
			import com.doumee.service.business.CarEventService;
			@@ -285,16 +286,16 @@
			carEventExcel.getRecords().stream().forEach(obj->{
			CarEventVo vo = new CarEventVo();
			vo.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType())) ;
			if(null != obj.getPersonType()) {
			if(Constants.ZERO == obj.getPersonType()){
			vo.setTypeName(Constants.Status.LW_FK.getDes());
			}else if(Constants.ONE == obj.getPersonType()) {
			vo.setTypeName(Constants.Status.PT_FK.getDes());
			}else {
			vo.setTypeName(Constants.Status.NB_FK.getDes());
			if(obj.getCompanyType() == null){
			obj.setCompanyType(Constants.THREE);
			}
			vo.setTypeName(Constants.Status.COMPANY_TYPE_FK.getDes());
			if(null != obj.getCompanyType()) {
			if(Constants.ZERO == obj.getCompanyType()){
			vo.setTypeName(Constants.Status.COMPANY_TYPE_REL.getDes());
			}else if(Constants.ONE == obj.getCompanyType()) {
			vo.setTypeName(Constants.Status.COMPANY_TYPE_INTERNAL.getDes());
			}
			}else {
			vo.setTypeName("");
			}
			vo.setPlateNos(obj.getPlateNos());
			vo.setPersonName(obj.getPersonName());
			@@ -318,7 +319,6 @@
			IPage<CarEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
			MPJLambdaWrapper<CarEvent> queryWrapper = new MPJLambdaWrapper<>();
			Utils.MP.blankToNull(pageWrap.getModel());

			queryWrapper
			.leftJoin(Member.class,Member::getId,CarEvent::getMemberId)
			.leftJoin(Company.class,Company::getId,Member::getCompanyId);
			@@ -328,21 +328,30 @@
			.selectAs(Member::getIdcardDecode,CarEventDTO::getPersonIdcardDecode)
			.selectAs(Member::getName,CarEventDTO::getPersonName)
			.selectAs(Member::getVisitCompanyName,CarEventDTO::getVisitCompanyName)
			.selectAs(Company::getName,CarEventDTO::getPersonCompanyName);

			.selectAs(Company::getName,CarEventDTO::getPersonCompanyName)
			.selectAs(Company::getType,CarEventDTO::getCompanyType);
			queryWrapper
			.like(StringUtils.isNotBlank(pageWrap.getModel().getPlateNos()),
			CarEvent::getPlateNos,
			pageWrap.getModel().getPlateNos())

			.and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),i->i.like(Member::getPhone,pageWrap.getModel().getKeyWords()).or().like(Member::getPhone,
			.and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),i->i.like(Member::getName,pageWrap.getModel().getKeyWords()).or().like(Member::getPhone,
			pageWrap.getModel().getKeyWords()))
			.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
			Company::getName,
			pageWrap.getModel().getCompanyName())
			.eq( pageWrap.getModel().getMemberType()!=null,
			Member::getType,
			pageWrap.getModel().getMemberType())


			.eq( pageWrap.getModel().getQueryUserType()!=null&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.ONE),
			Company::getType, Constants.ZERO)

			.isNull( pageWrap.getModel().getQueryUserType()!=null&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.ZERO),
			Member::getCompanyId)

			.eq( pageWrap.getModel().getQueryUserType()!=null&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.TWO),
			Company::getType, Constants.ONE)


			.eq(Objects.nonNull(pageWrap.getModel().getEventType()),
			CarEvent::getEventType,
			pageWrap.getModel().getEventType())