|
|
|
|
@ -84,6 +84,20 @@ public class ConfinementService extends ServiceImpl<ConfinementMapper, Confineme
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
records.forEach(one -> one.setNegativeId(negativeIdMap.get(one.getId()))); |
|
|
|
|
if (StrUtil.isNotBlank(param.getIsNegative())) { |
|
|
|
|
List<ConfinementVo> filtered = records; |
|
|
|
|
if ("1".equals(param.getIsNegative())) { |
|
|
|
|
filtered = records.stream() |
|
|
|
|
.filter(one -> StrUtil.isNotBlank(one.getNegativeId())) |
|
|
|
|
.collect(Collectors.toList()); |
|
|
|
|
} else if ("0".equals(param.getIsNegative())) { |
|
|
|
|
filtered = records.stream() |
|
|
|
|
.filter(one -> StrUtil.isBlank(one.getNegativeId())) |
|
|
|
|
.collect(Collectors.toList()); |
|
|
|
|
} |
|
|
|
|
confinementVoPage.setRecords(filtered); |
|
|
|
|
confinementVoPage.setTotal(filtered.size()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return confinementVoPage; |
|
|
|
|
} |
|
|
|
|
|