退料修改

This commit is contained in:
hongchao 2025-07-17 18:17:09 +08:00
parent b07b7c5db9
commit abcb019b70
1 changed files with 13 additions and 1 deletions

View File

@ -196,7 +196,19 @@ public class BackApplyServiceImpl implements BackApplyService {
// return getMaTypeDetails(view); // return getMaTypeDetails(view);
List<BackApplyInfo> view = backApplyMapper.getBackCheckView(bean); List<BackApplyInfo> view = backApplyMapper.getBackCheckView(bean);
// 移出taskStatus等于39(未完成)并且maStatus不等于16的数据 // 移出taskStatus等于39(未完成)并且maStatus不等于16的数据
view.removeIf(item -> "39".equals(item.getTaskStatus()) && !"16".equals(item.getMaStatus())); // view.removeIf(item -> "39".equals(item.getTaskStatus()) && item.getMaStatus() != null && !"16".equals(item.getMaStatus()));
// 存储已经处理过的 typeId
Set<String> processedTypeIds = new HashSet<>();
for (BackApplyInfo info : view) {
String typeId = info.getTypeId();
if (processedTypeIds.contains(typeId)) {
// 如果 typeId 已处理过 remark 置为 null
info.setRemark(null);
} else {
// 首次遇到该 typeId标记为已处理
processedTypeIds.add(typeId);
}
}
return view; return view;
} }