From c96b05ab329834d16ec2aad7a35e66dfa02511c1 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:40:34 +0800
Subject: [PATCH] #获取正常还车
---
server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 547c405..5bf3e6c 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
@@ -83,7 +83,7 @@
@Override
public Bikes findOne(Bikes bikes) {
QueryWrapper<Bikes> wrapper = new QueryWrapper<>(bikes);
- return bikesMapper.selectOne(wrapper);
+ return bikesMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
@@ -91,7 +91,7 @@
QueryWrapper<Bikes> wrapper = new QueryWrapper<>(bikes);
return bikesMapper.selectList(wrapper);
}
-
+
@Override
public PageData<Bikes> findJoinPage(PageWrap<Bikes> pageWrap) {
IPage<Bikes> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -156,9 +156,9 @@
if (pageWrap.getModel().getLockId() != null) {
queryWrapper.lambda().eq(Bikes::getLockId, pageWrap.getModel().getLockId());
}
- if (pageWrap.getModel().getLastRentData() != null) {
- queryWrapper.lambda().ge(Bikes::getLastRentData, Utils.Date.getStart(pageWrap.getModel().getLastRentData()));
- queryWrapper.lambda().le(Bikes::getLastRentData, Utils.Date.getEnd(pageWrap.getModel().getLastRentData()));
+ if (pageWrap.getModel().getLastRentDate() != null) {
+ queryWrapper.lambda().ge(Bikes::getLastRentDate, Utils.Date.getStart(pageWrap.getModel().getLastRentDate()));
+ queryWrapper.lambda().le(Bikes::getLastRentDate, Utils.Date.getEnd(pageWrap.getModel().getLastRentDate()));
}
if (pageWrap.getModel().getSoldoutDate() != null) {
queryWrapper.lambda().ge(Bikes::getSoldoutDate, Utils.Date.getStart(pageWrap.getModel().getSoldoutDate()));
--
Gitblit v1.9.3