From 1fd2c5a50bd375525603ca817938107dfc5c5395 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 06 十一月 2023 13:38:22 +0800
Subject: [PATCH] # 空字符串判断
---
server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
index 8d88509..d9371e5 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
@@ -125,11 +125,12 @@
.like(StringUtils.isNotEmpty(pageWrap.getModel().getBikeCode()),BikeRepair::getBinkeId,pageWrap.getModel().getBikeCode())
.eq( pageWrap.getModel().getStatus() !=null,BikeRepair::getStatus,pageWrap.getModel().getStatus());
if (Objects.nonNull(pageWrap.getModel().getStartDate())) {
- queryWrapper.ge(BikeRepair::getCreateDate,pageWrap.getModel().getStartDate());
+ queryWrapper.ge(BikeRepair::getCreateDate,Utils.Date.getStart(pageWrap.getModel().getStartDate()));
}
if (Objects.nonNull(pageWrap.getModel().getEndDate())) {
- queryWrapper.le(BikeRepair::getCreateDate, pageWrap.getModel().getEndDate());
+ queryWrapper.le(BikeRepair::getCreateDate,Utils.Date.getEnd(pageWrap.getModel().getEndDate()));
}
+ queryWrapper.orderByDesc(BikeRepair::getCreateDate);
return PageData.from(bikeRepairJoinMapper.selectJoinPage(page, BikeRepairDTO.class,queryWrapper));
}
--
Gitblit v1.9.3