From 973c131193c4dd3e4ed42518177a996a901037ec Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期五, 15 十二月 2023 17:57:01 +0800
Subject: [PATCH] 内部员工门禁组
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
index 4412954..460c1d2 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
@@ -23,6 +23,7 @@
import org.springframework.util.CollectionUtils;
import java.util.List;
+import java.util.Objects;
/**
* 鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃Service瀹炵幇
@@ -263,7 +264,7 @@
}
@Override
- public PageData<CarEventDTO> findVisitCarPage(PageWrap<VisitEventQuery> pageWrap) {
+ public PageData<CarEventDTO> findVisitCarPage(PageWrap<CarEvent> pageWrap) {
//鏄惁鏄暟瀛�
boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
//鏄惁鍖呭惈涓枃
@@ -284,24 +285,28 @@
.selectAs(Member::getIdcardDecode,CarEventDTO::getPersonIdcardDecode)
.selectAs(Member::getName,CarEventDTO::getPersonName)
.selectAs(Company::getName,CarEventDTO::getPersonCompanyName);
- queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCarNo()),
- CarEvent::getCardNo,
- pageWrap.getModel().getCarNo())
- .like(number,
- Member::getPhone,
- pageWrap.getModel().getKeyWords())
- .like((b || hasWord),
- Member::getPhone,
- pageWrap.getModel().getKeyWords())
- .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
- Company::getName,
- pageWrap.getModel().getCompanyName())
- .eq(StringUtils.isNotBlank(pageWrap.getModel().getMemberType()),
- Member::getType,
- pageWrap.getModel().getMemberType())
- .eq(StringUtils.isNotBlank(pageWrap.getModel().getSrcType()),
- CarEvent::getSrcType,
- pageWrap.getModel().getSrcType());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getPlateNos()),
+ CarEvent::getPlateNos,
+ pageWrap.getModel().getPlateNos())
+ .like(number,
+ Member::getPhone,
+ pageWrap.getModel().getKeyWords())
+ .like((b || hasWord),
+ Member::getPhone,
+ pageWrap.getModel().getKeyWords())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
+ Company::getName,
+ pageWrap.getModel().getCompanyName())
+ .eq(StringUtils.isNotBlank(pageWrap.getModel().getMemberType()),
+ Member::getType,
+ pageWrap.getModel().getMemberType())
+ .eq(Objects.nonNull(pageWrap.getModel().getEventType()),
+ CarEvent::getEventType,
+ pageWrap.getModel().getEventType())
+ .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
+ CarEvent::getCreateDate, pageWrap.getModel().getStartTime())
+ .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
+ CarEvent::getCreateDate, pageWrap.getModel().getEndTime());
IPage<CarEventDTO> carEventDTOIPage = carEventJoinMapper.selectJoinPage(page, CarEventDTO.class, queryWrapper);
return PageData.from(carEventDTOIPage);
--
Gitblit v1.9.3