From ee8ac99608f610b82cbe8186dc4a30fa7d65ccd3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 06 三月 2025 10:49:29 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 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 6539ec6..2a3e6c2 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,9 @@
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.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;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.VisitEventMapper;
@@ -172,6 +173,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());
}
@@ -239,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)
+ );
+ 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::getInOrOut,Constants.ZERO)
+ .eq( VisitEvent::getInOrOut,Constants.ZERO)
+ .isNotNull(VisitEvent::getVisitorId)
+ .eq( VisitEvent::getEventType,HKConstants.EventTypes.VISIT_SIGN_ICCM_PASS)
+ .groupBy(VisitEvent::getVisitorId)
+ );
+ if(count1!=null){
+ data.setVisitorNum(count);
+ }
+ return data;
+ }
@Override
public List<VisitEvent> findPageExcel(PageWrap<VisitEvent> pageWrap) {
IPage<VisitEvent> visitEventExcel = getDataInfo(pageWrap);
@@ -275,6 +307,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