DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(ems):优化告警记录查询逻辑并增加设备名称导出字段

Browse Source 
- 修改 EmsAlarmRecordServiceImpl 中的 queryList 方法，使用分页查询替代原有列表查询- 新增设备名称字段支持 Excel 导出- 同步修改 WmsOrderServiceImpl 中的 queryList 方法以统一查询方式- 调整查询构造器为分页模式，设置页面大小为最大值以兼容全量数据获取
This commit is contained in:
Joshi
2025-10-18 10:19:20 +08:00
parent 843843ae06
commit 7ba5a07176
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
klp-ems/src/main/java/com/klp/ems/domain/vo/EmsAlarmRecordVo.java
View File

@@ -90,6 +90,7 @@ public class EmsAlarmRecordVo {
private String remark; private String remark;
//联查设备名称 //联查设备名称
@ExcelProperty(value = "设备名称")
private String deviceName; private String deviceName;
private String deviceCode; private String deviceCode;
private String deviceType; private String deviceType;

7
klp-ems/src/main/java/com/klp/ems/service/impl/EmsAlarmRecordServiceImpl.java
View File

@@ -73,8 +73,11 @@ public class EmsAlarmRecordServiceImpl implements IEmsAlarmRecordService {
*/ */
@Override @Override
public List<EmsAlarmRecordVo> queryList(EmsAlarmRecordBo bo) { public List<EmsAlarmRecordVo> queryList(EmsAlarmRecordBo bo) {
LambdaQueryWrapper<EmsAlarmRecord> lqw = buildQueryWrapper(bo); QueryWrapper<EmsAlarmRecord> lqw = buildQueryWrapperPlus(bo);
return baseMapper.selectVoList(lqw); Page<Object> build = new PageQuery().build();
build.setSize(Long.MAX_VALUE);
Page<EmsAlarmRecordVo> emsAlarmRecordVoPage = baseMapper.selectVoPagePlus(build, lqw);
return emsAlarmRecordVoPage.getRecords();
} }
private LambdaQueryWrapper<EmsAlarmRecord> buildQueryWrapper(EmsAlarmRecordBo bo) { private LambdaQueryWrapper<EmsAlarmRecord> buildQueryWrapper(EmsAlarmRecordBo bo) {

5
klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java
View File

@@ -94,7 +94,10 @@ public class WmsOrderServiceImpl implements IWmsOrderService {
@Override @Override
public List<WmsOrderVo> queryList(WmsOrderBo bo) { public List<WmsOrderVo> queryList(WmsOrderBo bo) {
LambdaQueryWrapper<WmsOrder> lqw = buildQueryWrapper(bo); LambdaQueryWrapper<WmsOrder> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw); Page<Object> build = new PageQuery().build();
build.setSize(Long.MAX_VALUE);
Page<WmsOrderVo> wmsOrderVoPage = baseMapper.selectVoPlusPage(build, lqw);
return wmsOrderVoPage.getRecords();
} }
private LambdaQueryWrapper<WmsOrder> buildQueryWrapper(WmsOrderBo bo) { private LambdaQueryWrapper<WmsOrder> buildQueryWrapper(WmsOrderBo bo) {