From 647d596c7cbc5c65a7f4facfb82a3f31db31ed82 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 07 十一月 2023 17:29:45 +0800
Subject: [PATCH] # 实时车位信息
---
server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
index 3c939c0..b091bbd 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
@@ -124,10 +124,12 @@
.like(StringUtils.isNotBlank(pageWrap.getModel().getLockId()),Bikes::getLockId,pageWrap.getModel().getLockId())
.ne(Bikes::getLockId,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)
+ .or(b->b.ne(Bikes::getCode,"")));
queryWrapper.selectAll(Bikes.class)
.selectAs(BaseParam::getName,Bikes::getParamName)
.selectAs(Sites::getName,Bikes::getSiteName) ;
--
Gitblit v1.9.3