From 81b2bbdbb92dd70ca28c9d556cd8dc4e9329584f Mon Sep 17 00:00:00 2001 From: nidapeng <jp@doumee.com> Date: 星期一, 11 三月 2024 09:15:55 +0800 Subject: [PATCH] 整理 --- server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java index 1fba2a7..646d48d 100644 --- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java +++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java @@ -9,6 +9,7 @@ import com.doumee.dao.business.EmpowerMapper; import com.doumee.dao.business.join.EmpowerJoinMapper; import com.doumee.dao.business.model.Company; +import com.doumee.dao.business.model.Device; import com.doumee.dao.business.model.Empower; import com.doumee.dao.business.model.Member; import com.doumee.dao.system.model.SystemUser; @@ -109,18 +110,22 @@ queryWrapper.selectAs(Member::getName,Empower::getMemberName); queryWrapper.selectAs(Member::getPhone,Empower::getMemberPhone); queryWrapper.selectAs(Member::getIdcardDecode,Empower::getMemberidCard); + queryWrapper.selectAs(Device::getName,Empower::getDeviceName); queryWrapper.selectAs(Company::getName,Empower::getCompanyName); queryWrapper.selectAs(SystemUser::getUsername,Empower::getCreaterName); queryWrapper.leftJoin(Member.class,Member::getId,Empower::getMemberId); queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId); queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Empower::getCreator); + queryWrapper.leftJoin(Device.class,Device::getId,Empower::getDeviceId); queryWrapper /* .eq(Empower::getIsdeleted, Constants.ZERO)*/ .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName()) - .or().like(Member::getPhone,pageWrap.getModel().getCompanyName())); + .or().like(Member::getPhone,pageWrap.getModel().getMemberName())); queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getSendStatus()),Empower::getSendStatus,pageWrap.getModel().getSendStatus()); queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Company::getId,pageWrap.getModel().getCompanyId()); + queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName()); + queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getDeviceName()),Device::getName,pageWrap.getModel().getDeviceName()); queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getSendStartDate()),Empower::getSendDate,pageWrap.getModel().getSendStartDate()); queryWrapper.le(Objects.nonNull(pageWrap.getModel().getSendEndDate()),Empower::getSendDate,pageWrap.getModel().getSendEndDate()); -- Gitblit v1.9.3