k94314517
2025-04-28 880241700386e5ac5995546f70bac4a7f823612c
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -1321,6 +1321,9 @@
        queryWrapper.isNull(Visits::getParentId);
        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getMemberId()),Visits::getMemberId,pageWrap.getModel().getMemberId());
        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getReceptMemberId()),Visits::getReceptMemberId,pageWrap.getModel().getReceptMemberId());
        queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getQueryStarttime()),Visits::getStarttime,Utils.Date.getStart(pageWrap.getModel().getQueryStarttime()));
        queryWrapper.le(Objects.nonNull(pageWrap.getModel().getQueryEndtime()),Visits::getStarttime,Utils.Date.getEnd(pageWrap.getModel().getQueryEndtime()));
        if(Objects.nonNull(pageWrap.getModel().getBusinessStatus())){
            if(Constants.equalsInteger(pageWrap.getModel().getBusinessStatus(),Constants.TWO)){
@@ -1839,6 +1842,7 @@
            List<InterestedListVO> weekVisitList = new ArrayList<>();
            List<InterestedListVO> weekCarList = new ArrayList<>();
            List<InterestedListVO> lwList = new ArrayList<>();
            List<InterestedListVO> internalList = new ArrayList<>();
            //查询七天前的访客记录数量
            List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda().in(Visits::getStatus,
                    Constants.VisitStatus.signin,Constants.VisitStatus.signout)
@@ -1893,14 +1897,18 @@
                    .eq(Company::getIsdeleted,Constants.ZERO)
            );
            if(CollectionUtils.isNotEmpty(companyList)){
                List<Integer> companyIds = companyList.stream().map(i->i.getId()).collect(Collectors.toList());
                List<Company>  lwCompanyList  = companyList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList());
                if(CollectionUtils.isNotEmpty(lwCompanyList)){
                    List<Integer> lwCompanyIds = lwCompanyList.stream().map(i->i.getId()).collect(Collectors.toList());
                List<Retention> retentionList = retentionMapper.selectList(
                        new QueryWrapper<Retention>().lambda()
                                .eq(Retention::getType,Constants.TWO)
                                .in(Retention::getCompanyId,companyIds)
                                    .in(Retention::getCompanyId,lwCompanyIds)
                );
                for (Company company:companyList) {
                    for (Company company:lwCompanyList) {
                    Integer count = retentionList.stream().filter(i->Constants.equalsInteger(i.getCompanyId(),company.getId())).collect(Collectors.toList()).size();
                    if(count>0){
                        InterestedListVO lw = new InterestedListVO();
@@ -1911,6 +1919,26 @@
                }
            }
                List<Company>  internalCompanyList  = companyList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)).collect(Collectors.toList());
                if(CollectionUtils.isNotEmpty(internalCompanyList)){
                    List<Integer> internalCompanyIds = internalCompanyList.stream().map(i->i.getId()).collect(Collectors.toList());
                    List<Retention> retentionList = retentionMapper.selectList(
                            new QueryWrapper<Retention>().lambda()
                                    .eq(Retention::getType,Constants.TWO)
                                    .in(Retention::getCompanyId,internalCompanyIds)
                    );
                    for (Company company:internalCompanyList) {
                        Integer count = retentionList.stream().filter(i->Constants.equalsInteger(i.getCompanyId(),company.getId())).collect(Collectors.toList()).size();
                        if(count>0){
                            InterestedListVO lw = new InterestedListVO();
                            lw.setNum(count);
                            lw.setName(company.getName());
                            internalList.add(lw);
                        }
                    }
                }
            }
            pcWorkPlatformDataVO.setInternalList(internalList);
            pcWorkPlatformDataVO.setLwList(lwList   );
        }else if(Constants.equalsInteger(queryType,Constants.THREE)) {
            if (Objects.isNull(loginUserInfo.getMemberId())) {