From 289280c80f337e91d3644f68601d833071aa57c8 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 06 三月 2025 09:18:17 +0800 Subject: [PATCH] 最新版本541200007 --- 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