最新版本541200007

jiangping

2024-12-25 db5cab715e0fac78feb081a1ad342b8b9bab2edb

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

@@ -368,12 +368,24 @@
                .selectAs(Member::getPhone,DeviceEventDTO::getPersonPhone)
                .selectAs(Member::getIdcardDecode,DeviceEventDTO::getPersonIdcardDecode)
                .selectAs(Device::getName,DeviceEventDTO::getDevName)
                .selectAs(Company::getName,DeviceEventDTO::getPersonCompanyName);
                .selectAs(Company::getName,DeviceEventDTO::getPersonCompanyName)
                .selectAs(Company::getType,DeviceEventDTO::getCompanyType);

        queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),w->
                        w.like(Member::getName,pageWrap.getModel().getKeyWords()).or().like(Member::getPhone,pageWrap.getModel().getKeyWords()))
                .eq(StringUtils.equals(pageWrap.getModel().getPersonType(),Constants.TWO+""),
                        Member::getType,
                        pageWrap.getModel().getPersonType())


                .eq( pageWrap.getModel().getQueryUserType()!=null&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.ONE),
                        Company::getType, Constants.ZERO)

                .isNull( pageWrap.getModel().getQueryUserType()!=null&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.ZERO),
                        Member::getCompanyId)

                .eq( pageWrap.getModel().getQueryUserType()!=null&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.TWO),
                        Company::getType, Constants.ONE)

                .eq(Member::getIsdeleted,Constants.ZERO)

                .eq(Objects.nonNull(pageWrap.getModel().getEventType()),
                        DeviceEvent::getEventType,
                        pageWrap.getModel().getEventType())
@@ -385,7 +397,7 @@
                .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
                        DeviceEvent::getCreateDate,
                        pageWrap.getModel().getEndTime())
                .isNull(StringUtils.isNotBlank(pageWrap.getModel().getPersonType()) && !StringUtils.equals(pageWrap.getModel().getPersonType(),Constants.TWO+""),Member::getId)//除了内部人员都是外来访客

                .orderByDesc(DeviceEvent::getCreateDate);
        queryWrapper.orderByDesc(DeviceEvent::getHappenTime);
        IPage<DeviceEventDTO> deviceEventDTOIPage = deviceEventJoinMapper.selectJoinPage(page, DeviceEventDTO.class, queryWrapper);