访客系统
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
liukangdong
2025-03-06 3d3620b81b9c2ae8e8f41ef542f0e5fa8ae43c00 
 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){