attiya/ebike-share
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

分页bug修复及返回数据补全

Browse Source
This commit is contained in:
attiya 2025-08-22 09:32:30 +08:00
parent de9ba177bb
commit ffe8ffcdf9
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
View File

@ -1357,10 +1357,12 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
.leftJoin(EBIKE_CAR_STATUS_INFO).on(EBIKE_BIKE_INFO.STATE.eq(EBIKE_CAR_STATUS_INFO.CODE)) .leftJoin(EBIKE_CAR_STATUS_INFO).on(EBIKE_BIKE_INFO.STATE.eq(EBIKE_CAR_STATUS_INFO.CODE))
.leftJoin(EBIKE_DISPATCH_RECORDS).on(EBIKE_BIKE_INFO.BIKE_CODE.eq(EBIKE_DISPATCH_RECORDS.BIKE_CODE) .leftJoin(EBIKE_DISPATCH_RECORDS).on(EBIKE_BIKE_INFO.BIKE_CODE.eq(EBIKE_DISPATCH_RECORDS.BIKE_CODE)
.and(EBIKE_DISPATCH_RECORDS.DISPATCH_STATE.eq(0))) .and(EBIKE_DISPATCH_RECORDS.DISPATCH_STATE.eq(0)))
.where(EBIKE_BIKE_INFO.BIKE_CODE.like(queryParam.getBikeCode(), StringUtil.hasText(queryParam.getBikeCode())))
.where(EBIKE_BIKE_CHECKIN.OPERATE_TIME.ge(queryParam.getEnterTime(), queryParam.getEnterTime() != null))
.groupBy(EBIKE_BIKE_INFO.BIKE_ID); .groupBy(EBIKE_BIKE_INFO.BIKE_ID);
query.select( query.select(
case_() case_()
.when(EBIKE_DISPATCH_RECORDS.BIKE_CODE.isNotNull()) .when(EBIKE_DISPATCH_RECORDS.BIKE_CODE.isNull())
.then("投放中") .then("投放中")
.else_(case_() .else_(case_()
.when(EBIKE_CAR_STATUS_INFO.NAMEYW.isNull()).then(EBIKE_CAR_STATUS_INFO.NAMEYY) .when(EBIKE_CAR_STATUS_INFO.NAMEYW.isNull()).then(EBIKE_CAR_STATUS_INFO.NAMEYY)
@ -1369,8 +1371,6 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
.end().as("state_name") .end().as("state_name")
); );
query.where(EBIKE_BIKE_INFO.BIKE_CODE.like(queryParam.getBikeCode(), StringUtil.hasText(queryParam.getBikeCode())));
if (queryParam.getState() != null && !queryParam.getState().isEmpty()) { if (queryParam.getState() != null && !queryParam.getState().isEmpty()) {
String[] stateList = queryParam.getState().split(","); String[] stateList = queryParam.getState().split(",");
if (stateList.length == 1) { if (stateList.length == 1) {
@ -1380,8 +1380,6 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
} }
} }
query.where(EBIKE_BIKE_CHECKIN.OPERATE_TIME.ge(queryParam.getEnterTime(), queryParam.getEnterTime() != null));
return ebikeBikeInfoMapper.paginateAs(queryParam.getPageParam().getPage(), query, ResInventoryBikeListDto.class); return ebikeBikeInfoMapper.paginateAs(queryParam.getPageParam().getPage(), query, ResInventoryBikeListDto.class);
} }