Merge remote-tracking branch 'origin/master'

jiangping

2024-12-12 fdd38a72d0b0b87724aa94f7f9b5b0885f34cff5

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java

@@ -1260,6 +1260,23 @@
        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());

        if(Objects.nonNull(pageWrap.getModel().getBusinessStatus())){
            if(Constants.equalsInteger(pageWrap.getModel().getBusinessStatus(),Constants.TWO)){
                queryWrapper.in(Visits::getStatus,
                        Constants.VisitStatus.xfSuccess,
                        Constants.VisitStatus.xfFail,
                        Constants.VisitStatus.signin,
                        Constants.VisitStatus.signout,
                        Constants.VisitStatus.invalid,
                        Constants.VisitStatus.pass
                        );
            }else{
                queryWrapper.eq(Visits::getStatus,pageWrap.getModel().getBusinessStatus());
            }

        }

        queryWrapper.orderByDesc(Visits::getCreateDate);
        IPage<Visits> result = visitsJoinMapper.selectJoinPage(page, Visits.class,queryWrapper);