更新

MrShi

2025-02-17 3b5dc77ee03b5df1b49fffafc71a9c9aa56678cf

 server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java

@@ -116,18 +116,20 @@
        IPage<Bikes> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Bikes> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.orderByDesc(Bikes::getSiteId,Bikes::getLockId);
        queryWrapper.orderByAsc(Bikes::getSiteId,Bikes::getLockId);
        queryWrapper.leftJoin(BaseParam.class,BaseParam::getId,Bikes::getParamId)
                .leftJoin(Sites.class,Sites::getId,Bikes::getSiteId)
                .like(StringUtils.isNotBlank(pageWrap.getModel().getSiteId()),Bikes::getSiteId,pageWrap.getModel().getSiteId())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getSiteName()), Sites::getName,pageWrap.getModel().getSiteName())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getLockId()),Bikes::getLockId,pageWrap.getModel().getLockId())
                .ne(Bikes::getLockId,collect.get(Constants.FORCE_BACK_LOCK).getCode())
                .eq( pageWrap.getModel().getLockId() !=null,Bikes::getLockId,pageWrap.getModel().getLockId())
                .ne(Bikes::getLockId,Constants.formatIntegerFromStr(collect.get(Constants.FORCE_BACK_LOCK).getCode()))
                .ne(Bikes::getSiteId,collect.get(Constants.FORCE_BACK_SITE).getCode())
                .isNull(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.ONE,Bikes::getCode)
                .eq(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.ONE,Bikes::getCode,"")
                .isNotNull(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.TWO,Bikes::getCode)
                .ne(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.TWO,Bikes::getCode,"");
                .and(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.ONE,
                        s->s.isNull(Bikes::getCode)
                                .or(b->b.eq(Bikes::getCode,"")))
                .and(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.TWO,s->s
                .isNotNull(Bikes::getCode)
                .and(b->b.ne(Bikes::getCode,"")));
        queryWrapper.selectAll(Bikes.class)
                .selectAs(BaseParam::getName,Bikes::getParamName)
                .selectAs(Sites::getName,Bikes::getSiteName) ;