888

Jinquan_Ou

2023-04-21 923af8f8eb0d849b92afa8b567036aae2837f202

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java

@@ -42,36 +42,36 @@

    @Resource
    ZfEventService zfEventService;
    
    private String listFamilyIds(){

    private String listFamilyIds() {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        LambdaQueryWrapper<ZInfoUser> zInfoUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
        zInfoUserLambdaQueryWrapper.eq(ZInfoUser::getUserId,userId);
        zInfoUserLambdaQueryWrapper.eq(ZInfoUser::getUserId, userId);
        ZInfoUser zInfoUser = zInfoUserService.getOne(zInfoUserLambdaQueryWrapper);
        return zInfoUser.getFamilyId();
    }
    


    @Override
    public AjaxResult selectEventList(ZfEvent zfEvent, Integer pageNum, Integer pageSize) {
        String familyIds = listFamilyIds();
        LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent,familyIds);
        LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent, familyIds);

        Page<ZfEvent> ZfEventPage = new Page<>(pageNum,pageSize);
        Page<ZfEvent> ZfEventPage = new Page<>(pageNum, pageSize);
        Page<ZfEvent> pageResult = page(ZfEventPage, lqw);

        HashMap<String, Object> data = MapUtils.getResult(pageResult);
        return AjaxResult.success(data);
    }
    


    @Override
    public List<ZfEvent> selectByCondition(ZfEvent zfEvent) {
        String familyIds = listFamilyIds();
        LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent,familyIds);
        LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent, familyIds);
        List<ZfEvent> list = list(lqw);
        log.info("返回的数据为:{}",list);
        log.info("返回的数据为:{}", list);
        return list;
    }

@@ -119,11 +119,12 @@

    private LambdaQueryWrapper<ZfEvent> buildCondition(ZfEvent zfEvent) {
        LambdaQueryWrapper<ZfEvent> lqw = new LambdaQueryWrapper<>();
        lqw.like(!StringUtils.isEmpty(zfEvent.getAddress()),ZfEvent::getAddress,zfEvent.getAddress());
        lqw.like(!StringUtils.isEmpty(zfEvent.getPeople()),ZfEvent::getPeople,zfEvent.getPeople());
        lqw.like(!StringUtils.isEmpty(zfEvent.getTitle()),ZfEvent::getTitle,zfEvent.getTitle());
        lqw.like(!StringUtils.isEmpty(zfEvent.getRemark()),ZfEvent::getRemark,zfEvent.getRemark());
        lqw.like(zfEvent.getCreateTime()!=null,ZfEvent::getCreateTime,zfEvent.getCreateTime());
        lqw.like(!StringUtils.isEmpty(zfEvent.getAddress()), ZfEvent::getAddress, zfEvent.getAddress());
        lqw.like(!StringUtils.isEmpty(zfEvent.getPeople()), ZfEvent::getPeople, zfEvent.getPeople());
        lqw.like(!StringUtils.isEmpty(zfEvent.getTitle()), ZfEvent::getTitle, zfEvent.getTitle());
        lqw.like(!StringUtils.isEmpty(zfEvent.getRemark()), ZfEvent::getRemark, zfEvent.getRemark());
        lqw.eq(zfEvent.getHappenTime() != null, ZfEvent::getHappenTime, zfEvent.getHappenTime());
        lqw.between(zfEvent.getHappenStartTime() != null && zfEvent.getHappenEndTime() != null, ZfEvent::getHappenTime, zfEvent.getHappenStartTime(), zfEvent.getHappenEndTime());
        return lqw;
    }

@@ -131,9 +132,9 @@
        LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent);
        if (familyIds.contains(",")) {
            String[] familyList = familyIds.split(",");
            lqw.in(ZfEvent::getFamilyId,familyList);
        }else {
            lqw.eq(ZfEvent::getFamilyId,familyIds);
            lqw.in(ZfEvent::getFamilyId, familyList);
        } else {
            lqw.eq(ZfEvent::getFamilyId, familyIds);
        }
        return lqw;
    }