最新版本541200007

jiangping

2025-05-06 48ebf56c81939920c2360ce3ff9053c64bfbc03d

 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)){
@@ -1527,8 +1530,24 @@


    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public  void  visitLevelForCarOut(Visits visits){
        visits.setRemark("跟随访客车辆离园自动签离");
        visitLevelBiz(visits);
    }
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void  visitLevel(Integer visitId){
        Visits visits = visitsMapper.selectById(visitId);
        visits.setRemark("平台管理员手动签离成功");
        visitLevelBiz(visits);
        //产出在场人员信息
        retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
                .eq(Retention::getType,Constants.memberType.visitor)
                .eq(Retention::getMemberId,visits.getMemberId()));
    }

    private void visitLevelBiz(Visits visits) {
        if(Objects.isNull(visits)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
@@ -1539,14 +1558,16 @@
        request.setOrderId(visits.getHkId());
        //调用海康强制签离
        BaseResponse response =  HKService.iccmSignoff(request);
//        BaseResponse response =  HKService.outVisitAppiontment(request);
        visitsMapper.update(null,new UpdateWrapper<Visits>().lambda().set(Visits::getStatus,Constants.VisitStatus.signout)
                .eq(Visits::getId,visitId));
        //产出在场人员信息
        retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
                .eq(Retention::getType,Constants.memberType.visitor)
                .eq(Retention::getMemberId,visits.getMemberId()));
        if(response!=null &&StringUtils.isNotBlank(response.getCode()) && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)){
            visitsMapper.update(null,new UpdateWrapper<Visits>().lambda()
                    .set(Visits::getStatus,Constants.VisitStatus.signout)
                    .set(Visits::getRemark,visits.getRemark())
                    .eq(Visits::getId,visits.getId()));
        }else{
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"访客签离失败，请刷新重试");
        }
    }

    @Override
    public void  visitCancel(Integer visitId){
        Visits visits = visitsMapper.selectById(visitId);
@@ -1839,6 +1860,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,25 +1915,49 @@
                    .eq(Company::getIsdeleted,Constants.ZERO)
            );



            if(CollectionUtils.isNotEmpty(companyList)){
                List<Integer> companyIds = companyList.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)
                );
                for (Company company:companyList) {
                    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());
                        lwList.add(lw);
                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,lwCompanyIds)
                    );
                    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();
                            lw.setNum(count);
                            lw.setName(company.getName());
                            lwList.add(lw);
                        }
                    }
                }

                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.setLwList(lwList   );
            pcWorkPlatformDataVO.setInternalList(internalList);
            pcWorkPlatformDataVO.setLwList(lwList);
        }else if(Constants.equalsInteger(queryType,Constants.THREE)) {
            if (Objects.isNull(loginUserInfo.getMemberId())) {
                pcWorkPlatformDataVO.setNoticesList(new ArrayList<>());