cuizhibin
/
znpt-backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复设备管理相关功能分页查询表格无法顺利下拉和分页条不固定问题

This commit is contained in:
Mr.j 2025-08-13 09:28:41 +08:00
parent 53aa75d37b
commit e19d849045
3 changed files with 56 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/com/dite/znpt/domain/vo/EquipmentApprovalListReq.java
View File

@ -43,6 +43,9 @@ public class EquipmentApprovalListReq implements Serializable {
@ApiModelProperty("当前页码")
private Integer page;
@ApiModelProperty("当前页码 - 与前端保持一致")
private Integer pageNum;
@ApiModelProperty("每页大小")
private Integer pageSize;

32
core/src/main/java/com/dite/znpt/service/impl/EquipmentApprovalServiceImpl.java
View File

@ -45,6 +45,12 @@ public class EquipmentApprovalServiceImpl implements EquipmentApprovalService {
public IPage<EquipmentApprovalResp> getPendingApprovals(EquipmentApprovalListReq req) {
log.info("开始执行待审批设备分页查询，请求参数: {}", req);
// 获取分页参数
Integer pageNum = req.getPageNum() != null ? req.getPageNum() : 1;
Integer pageSize = req.getPageSize() != null ? req.getPageSize() : 10;
log.info("分页参数 - pageNum: {}, pageSize: {}", pageNum, pageSize);
// 使用分页插件
PageUtil.startPage();
@ -63,10 +69,12 @@ public class EquipmentApprovalServiceImpl implements EquipmentApprovalService {
.collect(Collectors.toList());
// 获取分页信息
PageInfo<EquipmentApprovalResp> pageInfo = new PageInfo<>(respList);
PageInfo<EquipmentApprovalEntity> pageInfo = new PageInfo<>(approvalList);
log.info("待审批设备分页查询完成，共查询 {} 条记录，当前页码: {}, 总页码: {}", pageInfo.getTotal(), pageInfo.getPageNum(), pageInfo.getPages());
// 创建响应分页对象
Page<EquipmentApprovalResp> result = new Page<>(pageInfo.getPageNum(), pageInfo.getPageSize(), pageInfo.getTotal());
Page<EquipmentApprovalResp> result = new Page<>(pageNum, pageSize, pageInfo.getTotal());
result.setRecords(respList);
return result;
@ -76,6 +84,12 @@ public class EquipmentApprovalServiceImpl implements EquipmentApprovalService {
public IPage<EquipmentApprovalResp> getApprovedApprovals(EquipmentApprovalListReq req) {
log.info("开始执行已审批设备分页查询，请求参数: {}", req);
// 获取分页参数
Integer pageNum = req.getPageNum() != null ? req.getPageNum() : 1;
Integer pageSize = req.getPageSize() != null ? req.getPageSize() : 10;
log.info("分页参数 - pageNum: {}, pageSize: {}", pageNum, pageSize);
// 使用分页插件
PageUtil.startPage();
@ -94,10 +108,12 @@ public class EquipmentApprovalServiceImpl implements EquipmentApprovalService {
.collect(Collectors.toList());
// 获取分页信息
PageInfo<EquipmentApprovalResp> pageInfo = new PageInfo<>(respList);
PageInfo<EquipmentApprovalEntity> pageInfo = new PageInfo<>(approvalList);
log.info("已审批设备分页查询完成，共查询 {} 条记录，当前页码: {}, 总页码: {}", pageInfo.getTotal(), pageInfo.getPageNum(), pageInfo.getPages());
// 创建响应分页对象
Page<EquipmentApprovalResp> result = new Page<>(pageInfo.getPageNum(), pageInfo.getPageSize(), pageInfo.getTotal());
Page<EquipmentApprovalResp> result = new Page<>(pageNum, pageSize, pageInfo.getTotal());
result.setRecords(respList);
return result;
@ -484,11 +500,13 @@ public class EquipmentApprovalServiceImpl implements EquipmentApprovalService {
public IPage<EquipmentApprovalResp> getMyProcurementApplications(EquipmentApprovalListReq req) {
log.info("开始获取我的采购申请，请求参数: {}", req);
// 创建分页对象
Integer pageNum = req.getPage() != null ? req.getPage() : 1;
// 创建分页对象 - 使用pageNum保持一致性
Integer pageNum = req.getPageNum() != null ? req.getPageNum() : 1;
Integer pageSize = req.getPageSize() != null ? req.getPageSize() : 10;
Page<EquipmentApprovalEntity> page = new Page<>(pageNum, pageSize);
log.info("分页参数 - pageNum: {}, pageSize: {}", pageNum, pageSize);
LambdaQueryWrapper<EquipmentApprovalEntity> wrapper = new LambdaQueryWrapper<>();
// 只查询当前用户的申请
@ -500,6 +518,8 @@ public class EquipmentApprovalServiceImpl implements EquipmentApprovalService {
IPage<EquipmentApprovalEntity> result = equipmentApprovalMapper.selectPage(page, wrapper);
log.info("我的采购申请分页查询完成，共查询 {} 条记录，当前页码: {}, 总页码: {}", result.getTotal(), result.getCurrent(), result.getPages());
return convertToRespPage(result);
}

34
core/src/main/java/com/dite/znpt/service/impl/EquipmentServiceImpl.java
View File

@ -40,6 +40,12 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
public IPage<EquipmentResp> page(EquipmentListReq req) {
log.info("开始执行设备分页查询，请求参数: {}", req);
// 获取分页参数
Integer pageNum = req.getPageNum() != null ? req.getPageNum() : 1;
Integer pageSize = req.getPageSize() != null ? req.getPageSize() : 10;
log.info("分页参数 - pageNum: {}, pageSize: {}", pageNum, pageSize);
// 使用分页插件
PageUtil.startPage();
@ -261,18 +267,20 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
// 执行查询
List<EquipmentEntity> equipmentList = this.list(queryWrapper);
log.info("查询完成，当前页记录数: {}", equipmentList.size());
log.info("查询完成，当前页记录数: {}, 总记录数: {}",
equipmentList.size());
// 转换为响应对象
List<EquipmentResp> equipmentRespList = equipmentList.stream()
.map(this::convertToResp)
.collect(Collectors.toList());
// 获取分页信息
PageInfo<EquipmentResp> pageInfo = new PageInfo<>(equipmentRespList);
// 获取分页信息 - 使用正确的实体类型
PageInfo<EquipmentEntity> pageInfo = new PageInfo<>(equipmentList);
// 创建响应分页对象
Page<EquipmentResp> respPage = new Page<>(pageInfo.getPageNum(), pageInfo.getPageSize(), pageInfo.getTotal());
log.info("获取总数: {}", pageInfo.getTotal());
// 创建响应分页对象 - 使用正确的分页参数
Page<EquipmentResp> respPage = new Page<>(pageNum, pageSize, pageInfo.getTotal());
respPage.setRecords(equipmentRespList);
return respPage;
@ -498,6 +506,12 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
public IPage<EquipmentResp> procurementPage(EquipmentListReq req) {
log.info("开始执行设备采购记录分页查询，请求参数: {}", req);
// 获取分页参数
Integer pageNum = req.getPageNum() != null ? req.getPageNum() : 1;
Integer pageSize = req.getPageSize() != null ? req.getPageSize() : 10;
log.info("分页参数 - pageNum: {}, pageSize: {}", pageNum, pageSize);
// 使用分页插件
PageUtil.startPage();
@ -617,11 +631,13 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
.map(this::convertToResp)
.collect(Collectors.toList());
// 获取分页信息
PageInfo<EquipmentResp> pageInfo = new PageInfo<>(records);
// 获取分页信息 - 使用正确的实体类型
PageInfo<EquipmentEntity> pageInfo = new PageInfo<>(equipmentList);
// 创建响应分页对象
Page<EquipmentResp> result = new Page<>(pageInfo.getPageNum(), pageInfo.getPageSize(), pageInfo.getTotal());
log.info("设备采购分页查询完成，共查询 {} 条记录，当前页码: {}, 总页码: {}", pageInfo.getTotal(), pageInfo.getPageNum(), pageInfo.getPages());
// 创建响应分页对象 - 使用正确的分页参数
Page<EquipmentResp> result = new Page<>(pageNum, pageSize, pageInfo.getTotal());
result.setRecords(records);
return result;