diff --git a/src/main/java/ru/nbch/credit_tracker/entities/indic/Name.java b/src/main/java/ru/nbch/credit_tracker/entities/indic/Name.java index 70eb0a7..3237baa 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/indic/Name.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/indic/Name.java @@ -16,6 +16,7 @@ public class Name { private Integer fid; private String number; private LocalDate fileSinceDate; + private LocalDate fileSinceDatePn; private String first; private String last; private String middle; diff --git a/src/main/java/ru/nbch/credit_tracker/service/indic/PersonServiceV2.java b/src/main/java/ru/nbch/credit_tracker/service/indic/PersonServiceV2.java index 30fac7f..4daf172 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/indic/PersonServiceV2.java +++ b/src/main/java/ru/nbch/credit_tracker/service/indic/PersonServiceV2.java @@ -27,7 +27,8 @@ public class PersonServiceV2 { .thenComparing(Id::getFileSinceDate, Comparator.nullsLast(Comparator.naturalOrder())); private final Comparator byDateThenIdNullSafe = - Comparator.comparing(Name::getFileSinceDate, Comparator.nullsFirst(Comparator.naturalOrder())) + Comparator.comparing(Name::getFileSinceDatePn, Comparator.nullsFirst(Comparator.naturalOrder())) + .thenComparing(Name::getFileSinceDate, Comparator.nullsFirst(Comparator.naturalOrder())) .thenComparing(Name::getFid); public PersonServiceV2(PersonMapper mapper) { diff --git a/src/main/resources/mybatis/mapper/indic/PersonMapper.xml b/src/main/resources/mybatis/mapper/indic/PersonMapper.xml index 6c780e2..abb42f6 100644 --- a/src/main/resources/mybatis/mapper/indic/PersonMapper.xml +++ b/src/main/resources/mybatis/mapper/indic/PersonMapper.xml @@ -9,6 +9,7 @@ + @@ -29,6 +30,7 @@ SELECT pn.number as number, pn.fid as fid, + pn.FILE_SINCE_DT as file_since_dt_pn, nf.first as first, nf.middle as middle, nf.name_1 as name_1,