diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java index 76108b56..ee26152f 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java @@ -143,7 +143,11 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService { public TableDataInfo queryPageList(WmsCheckTaskBo bo, PageQuery pageQuery) { QueryWrapper qw = buildQueryWrapperPlus(bo); Page result = baseMapper.selectVoPagePlus(pageQuery.build(), qw); + additionalInformation(result); + return TableDataInfo.build(result); + } + private void additionalInformation(Page result) { // 处理结果中的钢卷信息 List records = result.getRecords(); for (WmsCheckTaskVo vo : records) { @@ -165,9 +169,8 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService { vo.setCoilList(coilList); } } - - return TableDataInfo.build(result); } + private QueryWrapper buildQueryWrapperPlus(WmsCheckTaskBo bo) { Map params = bo.getParams(); com.baomidou.mybatisplus.core.conditions.query.QueryWrapper qw = Wrappers.query(); @@ -190,6 +193,7 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService { public TableDataInfo queryPageListHistory(WmsCheckTaskBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + additionalInformation(result); return TableDataInfo.build(result); }