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 |   42 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 39 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 b00e906..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
@@ -3,8 +3,10 @@
 import cn.hutool.core.lang.PatternPool;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.ReUtil;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+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;
 import com.doumee.core.utils.Utils;
 import com.doumee.dao.business.VisitEventMapper;
@@ -171,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());
         }
@@ -238,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);
@@ -274,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