From 49342bf38f61e1d7b1890dd64f2690557b77498e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 06 三月 2025 10:49:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 2a3e6c2..df2ed78 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
@@ -253,7 +253,7 @@
.le(StringUtils.isNotBlank(model.getEndTime()), VisitEvent::getCreateDate,model.getEndTime())
.eq(VisitEvent::getInOrOut,Constants.ZERO)
.isNotNull(VisitEvent::getVisitorId)
- .eq(VisitEvent::getEventType,HKConstants.EventTypes.VISIT_SIGN_ICCM_PASS)
+ .eq(VisitEvent::getEventType,HKConstants.EventTypes.VISIT_SIGN_ICCM_PASS.getKey())
);
if(count!=null){
data.setEventNum(count);
@@ -261,10 +261,10 @@
Long count1 = visitEventJoinMapper.selectCount(new QueryWrapper<VisitEvent>().lambda()
.ge(StringUtils.isNotBlank(model.getStartTime()),VisitEvent::getCreateDate, model.getStartTime())
.le(StringUtils.isNotBlank(model.getEndTime()), VisitEvent::getCreateDate,model.getEndTime())
- .eq( VisitEvent::getInOrOut,Constants.ZERO)
+ .eq( VisitEvent::getIsdeleted,Constants.ZERO)
.eq( VisitEvent::getInOrOut,Constants.ZERO)
.isNotNull(VisitEvent::getVisitorId)
- .eq( VisitEvent::getEventType,HKConstants.EventTypes.VISIT_SIGN_ICCM_PASS)
+ .eq(VisitEvent::getEventType,HKConstants.EventTypes.VISIT_SIGN_ICCM_PASS.getKey())
.groupBy(VisitEvent::getVisitorId)
);
if(count1!=null){
--
Gitblit v1.9.3