This commit is contained in:
parent
6b4d6908d1
commit
35bc835a0d
3 changed files with 7 additions and 3 deletions
|
|
@ -72,7 +72,8 @@ public class PersonServiceV2 {
|
||||||
return names.stream()
|
return names.stream()
|
||||||
.filter(name ->
|
.filter(name ->
|
||||||
StringUtils.isNotEmpty(name.getFirst()) &&
|
StringUtils.isNotEmpty(name.getFirst()) &&
|
||||||
StringUtils.isNotEmpty(name.getLast())
|
StringUtils.isNotEmpty(name.getLast()) &&
|
||||||
|
name.getBirthDate() != null
|
||||||
)
|
)
|
||||||
.collect(Collectors.toMap(
|
.collect(Collectors.toMap(
|
||||||
Name::getNumber,
|
Name::getNumber,
|
||||||
|
|
|
||||||
|
|
@ -54,6 +54,9 @@ public final class XmlMergeCoordinator implements IPipeLineTerminator<PartFilePa
|
||||||
log.info("Stage time stats: {}", stopWatch.info());
|
log.info("Stage time stats: {}", stopWatch.info());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (part.getPartPath() == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
try (var m = stopWatch.start("XmlMergeCoordinator")) {
|
try (var m = stopWatch.start("XmlMergeCoordinator")) {
|
||||||
mergeBatch(part);
|
mergeBatch(part);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,7 @@ public class CTUtil {
|
||||||
if (StringUtils.isBlank(value)) {
|
if (StringUtils.isBlank(value)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return value.replaceAll("[^А-Яа-яA-Za-z0-9]", "");
|
return value.replaceAll("[^0-9]", "");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String normalizePassport(Id id) {
|
public static String normalizePassport(Id id) {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue