feat(wms): 添加历史钢卷待完成操作功能
- 新增查询历史钢卷待完成操作列表接口 - 在后端服务中添加按创建时间和扫描时间倒序排序 - 实现用户名到昵称的映射显示功能 - 创建新的stale.vue页面展示历史钢卷操作列表 - 添加完成和取消历史钢卷操作的功能按钮 - 集成字典标签显示操作类型和状态信息
This commit is contained in:
@@ -177,7 +177,31 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer
|
||||
QueryWrapper<WmsCoilPendingAction> lqw = Wrappers.query();
|
||||
lqw.ne("wcpa.action_status", 2);
|
||||
lqw.eq("wcpa.del_flag", 0);
|
||||
lqw.orderByDesc("wcpa.create_time");
|
||||
lqw.orderByDesc("wcpa.scan_time");
|
||||
Page<WmsCoilPendingActionVo> result = baseMapper.selectStaleActionVoPagePlus(pageQuery.build(), lqw);
|
||||
List<WmsCoilPendingActionVo> records = result.getRecords();
|
||||
if (records != null && !records.isEmpty()) {
|
||||
Set<String> userNames = records.stream()
|
||||
.flatMap(v -> java.util.stream.Stream.of(v.getCreateBy(), v.getOperatorName()))
|
||||
.filter(StringUtils::isNotBlank)
|
||||
.collect(Collectors.toSet());
|
||||
if (!userNames.isEmpty()) {
|
||||
Map<String, String> nickMap = userService.selectNickNameMapByUserNames(records.stream()
|
||||
.flatMap(v -> java.util.stream.Stream.of(v.getCreateBy(), v.getOperatorName()))
|
||||
.filter(StringUtils::isNotBlank)
|
||||
.distinct()
|
||||
.collect(Collectors.toList()));
|
||||
records.forEach(item -> {
|
||||
if (StringUtils.isNotBlank(item.getCreateBy())) {
|
||||
item.setCreateByName(nickMap.getOrDefault(item.getCreateBy(), item.getCreateBy()));
|
||||
}
|
||||
if (StringUtils.isNotBlank(item.getOperatorName())) {
|
||||
item.setOperatorByName(nickMap.getOrDefault(item.getOperatorName(), item.getOperatorName()));
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user