From 3d3620b81b9c2ae8e8f41ef542f0e5fa8ae43c00 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 06 三月 2025 10:53:27 +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 | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 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 d8f00e9..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
@@ -4,6 +4,7 @@
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.ReUtil;
import com.doumee.core.haikang.model.HKConstants;
+import com.doumee.dao.business.vo.VisitEventCountVO;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
@@ -242,7 +243,35 @@
}
return PageData.from(visitEventDTOIPage);
}
-
+ @Override
+ public VisitEventCountVO countNum(VisitEvent model){
+ VisitEventCountVO data = new VisitEventCountVO();
+ data.setEventNum(0l);
+ data.setVisitorNum(0l);
+ Long count = 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)
+ .isNotNull(VisitEvent::getVisitorId)
+ .eq(VisitEvent::getEventType,HKConstants.EventTypes.VISIT_SIGN_ICCM_PASS.getKey())
+ );
+ if(count!=null){
+ data.setEventNum(count);
+ }
+ 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::getIsdeleted,Constants.ZERO)
+ .eq( VisitEvent::getInOrOut,Constants.ZERO)
+ .isNotNull(VisitEvent::getVisitorId)
+ .eq(VisitEvent::getEventType,HKConstants.EventTypes.VISIT_SIGN_ICCM_PASS.getKey())
+ .groupBy(VisitEvent::getVisitorId)
+ );
+ if(count1!=null){
+ data.setVisitorNum(count);
+ }
+ return data;
+ }
@Override
public List<VisitEvent> findPageExcel(PageWrap<VisitEvent> pageWrap) {
IPage<VisitEvent> visitEventExcel = getDataInfo(pageWrap);
--
Gitblit v1.9.3