From c2462e9fc36a709abcb94aae2a31c4656a349daa Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 05 三月 2025 15:08:25 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
index 6539ec6..d8f00e9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
@@ -4,8 +4,8 @@
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.ReUtil;
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.business.VisitEventMapper;
@@ -172,6 +172,9 @@
if (pageWrap.getModel().getIdNo() != null) {
queryWrapper.lambda().eq(VisitEvent::getIdNo, pageWrap.getModel().getIdNo());
}
+ if (pageWrap.getModel().getInOrOut() != null) {
+ queryWrapper.lambda().eq(VisitEvent::getInOrOut, pageWrap.getModel().getInOrOut());
+ }
if (pageWrap.getModel().getBeVisitedPersonName() != null) {
queryWrapper.lambda().eq(VisitEvent::getBeVisitedPersonName, pageWrap.getModel().getBeVisitedPersonName());
}
@@ -275,6 +278,9 @@
.eq(Objects.nonNull(pageWrap.getModel().getEventType()),
VisitEvent::getEventType,
pageWrap.getModel().getEventType())
+ .eq(Objects.nonNull(pageWrap.getModel().getInOrOut()),
+ VisitEvent::getInOrOut,
+ pageWrap.getModel().getInOrOut())
.ge(StringUtils.isNotBlank(pageWrap.getModel().getStartTime()),
VisitEvent::getCreateDate,
pageWrap.getModel().getStartTime())
--
Gitblit v1.9.3