From 30b2d11d595dbb99853541c8f86be5220daf58d0 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期三, 13 十二月 2023 18:08:23 +0800
Subject: [PATCH] 在场人员信息
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index 6339165..1f1714e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -197,27 +197,23 @@
IPage<Retention> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Retention> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- queryWrapper.leftJoin(Company.class,Company::getId,Retention::getId)
- .leftJoin(Member.class,Member::getId,Retention::getMemberId)
- .leftJoin(DeviceEvent.class,DeviceEvent::getEventId,Retention::getEventCode);
+ queryWrapper.leftJoin(Company.class,Company::getId,Retention::getId);
queryWrapper.selectAll(Retention.class)
- .selectAs(Company::getName,Retention::getCompanyName)
- .selectAs(Member::getType,Retention::getMemberType)
- .selectAs(DeviceEvent::getSrcName,Retention::getSrcName);
- queryWrapper.like(number,Member::getPhone,pageWrap.getModel().getKeyWords())
- .like((b||hasWord),Member::getName,pageWrap.getModel().getKeyWords())
+ .selectAs(Company::getName,Retention::getCompanyName);
+ queryWrapper.like(number,Retention::getPhone,pageWrap.getModel().getKeyWords())
+ .like((b||hasWord),Retention::getName,pageWrap.getModel().getKeyWords())
.eq(Objects.nonNull(pageWrap.getModel().getType()),
- Member::getType,
+ Retention::getType,
pageWrap.getModel().getType())
.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
Company::getName,
pageWrap.getModel().getCompanyName())
.ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
Retention::getEventDate,
- Utils.Date.getStart(pageWrap.getModel().getStartTime()))
+ pageWrap.getModel().getStartTime() == null?null:pageWrap.getModel().getStartTime()+" 00:00:00")
.le(Objects.nonNull(pageWrap.getModel().getEndTime()),
Retention::getEventDate,
- Utils.Date.getDayEnd(pageWrap.getModel().getEndTime()));
+ pageWrap.getModel().getStartTime() == null?null:pageWrap.getModel().getEndTime()+" 23:59:59");
queryWrapper.orderByDesc(Retention::getCreateDate);
IPage<Retention> retentionIPage = retentionJoinMapper.selectJoinPage(page, Retention.class, queryWrapper);
return PageData.from(retentionIPage);
--
Gitblit v1.9.3