Merge branch 'dev' into dev-g

This commit is contained in:
Guoqs
2025-06-17 15:08:36 +08:00
4 changed files with 16 additions and 30 deletions

View File

@@ -102,4 +102,9 @@ public class QueryOrderDTO extends BaseEntity {
* 车辆vin编号
*/
private String vinCode;
/**
* 车牌号
*/
private String plateNumber;
}

View File

@@ -456,14 +456,14 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService {
Comparator.nullsLast(Comparator.naturalOrder())) // 处理可能的null值
);
// 4. 手动分页(取出当前页的数据)
// 手动分页(取出当前页的数据)
int fromIndex = (pageNum - 1) * pageSize;
int toIndex = Math.min(fromIndex + pageSize, pileConnectorInfoList.size());
List<PileConnectorInfoVO> pagedList = pileConnectorInfoList.subList(fromIndex, toIndex);
// PageInfo<PileConnectorInfoVO> pageInfo = new PageInfo<>(pileConnectorInfoList);
// 5. 构造 PageInfo注意PageInfo 需要总记录数)
// 构造 PageInfo注意PageInfo 需要总记录数)
PageInfo<PileConnectorInfoVO> pageInfo = new PageInfo<>(pagedList);
pageInfo.setTotal(pileConnectorInfoList.size()); // 设置总记录数
pageInfo.setPageNum(pageNum); // 设置当前页码