From 4ba6249cc7d516f95dd8d39e3cba87ad01dfae81 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期四, 14 十二月 2023 16:16:36 +0800
Subject: [PATCH] 访客事件信息
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
index 3463258..4ff7a2a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
@@ -10,10 +10,7 @@
import com.doumee.dao.admin.response.VisitEventDTO;
import com.doumee.dao.business.VisitEventMapper;
import com.doumee.dao.business.join.VisitEventJoinMapper;
-import com.doumee.dao.business.model.Company;
-import com.doumee.dao.business.model.DeviceEvent;
-import com.doumee.dao.business.model.Member;
-import com.doumee.dao.business.model.VisitEvent;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.VisitEventService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -228,7 +225,7 @@
}
@Override
- public PageData<VisitEventDTO> findVisitPage(PageWrap<VisitEventQuery> pageWrap) {
+ public PageData<VisitEventDTO> findVisitPage(PageWrap<VisitEvent> pageWrap) {
//鏄惁鏄暟瀛�
boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
@@ -239,38 +236,30 @@
IPage<VisitEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<VisitEvent> queryWrapper = new MPJLambdaWrapper<>();
- queryWrapper.leftJoin(Member.class,Member::getId,VisitEvent::getVisitorId)
- .leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper .leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper.selectAll(VisitEvent.class)
- .selectAs(Member::getPhone,VisitEventDTO::getPersonPhone)
- .selectAs(Member::getType,VisitEventDTO::getPersonType)
- .selectAs(Member::getIdcardDecode,VisitEventDTO::getPersonIdcardDecode)
.selectAs(Company::getName,VisitEventDTO::getPersonCompanyName);
-
queryWrapper.like(number,
- Member::getPhone,
+ VisitEvent::getPhone,
pageWrap.getModel().getKeyWords())
.like((b ||hasWord),
- Member::getPhone,
+ VisitEvent::getPersonName,
pageWrap.getModel().getKeyWords())
.like(StringUtils.isNotBlank(pageWrap.getModel().getCarNo()),
- Member::getPhone,
+ VisitEvent::getCarNo,
pageWrap.getModel().getKeyWords())
.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
Company::getName,
pageWrap.getModel().getCompanyName())
- .eq(StringUtils.isNotBlank(pageWrap.getModel().getSrcType()),
- VisitEvent::getSrcType,
- pageWrap.getModel().getSrcType())
- .eq(StringUtils.isNotBlank(pageWrap.getModel().getEventType()),
+ .eq(Objects.nonNull(pageWrap.getModel().getEventType()),
VisitEvent::getEventType,
pageWrap.getModel().getEventType())
.ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
VisitEvent::getHappenTime,
- Utils.Date.getStart(pageWrap.getModel().getStartTime()))
+ pageWrap.getModel().getStartTime())
.le(Objects.nonNull(pageWrap.getModel().getEndTime()),
VisitEvent::getHappenTime,
- Utils.Date.getDayEnd(pageWrap.getModel().getEndTime()));
+ pageWrap.getModel().getEndTime());
queryWrapper.orderByDesc(VisitEvent::getHappenTime);
IPage<VisitEventDTO> visitEventDTOIPage = visitEventJoinMapper.selectJoinPage(page, VisitEventDTO.class, queryWrapper);
return PageData.from(visitEventDTOIPage);
--
Gitblit v1.9.3