treshenkov/credit_tracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/BKI-3308

Browse source
This commit is contained in:
etreschenkov 2026-01-19 17:04:54 +03:00
parent 5126b7042e
commit e7cb1526d7
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/ru/nbch/credit_tracker/entities/indic/Name.java
View file

@ -16,6 +16,7 @@ public class Name {
private Integer fid; private Integer fid;
private String number; private String number;
private LocalDate fileSinceDate; private LocalDate fileSinceDate;
private LocalDate fileSinceDatePn;
private String first; private String first;
private String last; private String last;
private String middle; private String middle;

3
src/main/java/ru/nbch/credit_tracker/service/indic/PersonServiceV2.java
View file

@ -27,7 +27,8 @@ public class PersonServiceV2 {
.thenComparing(Id::getFileSinceDate, Comparator.nullsLast(Comparator.naturalOrder())); .thenComparing(Id::getFileSinceDate, Comparator.nullsLast(Comparator.naturalOrder()));
private final Comparator<Name> byDateThenIdNullSafe = private final Comparator<Name> 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); .thenComparing(Name::getFid);
public PersonServiceV2(PersonMapper mapper) { public PersonServiceV2(PersonMapper mapper) {

2
src/main/resources/mybatis/mapper/indic/PersonMapper.xml
View file

@ -9,6 +9,7 @@
<result property="fid" column="fid"/> <result property="fid" column="fid"/>
<result property="number" column="number"/> <result property="number" column="number"/>
<result property="fileSinceDate" column="file_since_dt_name"/> <result property="fileSinceDate" column="file_since_dt_name"/>
<result property="fileSinceDatePn" column="file_since_dt_pn"/>
<result property="first" column="first"/> <result property="first" column="first"/>
<result property="last" column="NAME_1"/> <result property="last" column="NAME_1"/>
<result property="middle" column="middle"/> <result property="middle" column="middle"/>
@ -29,6 +30,7 @@
SELECT SELECT
pn.number as number, pn.number as number,
pn.fid as fid, pn.fid as fid,
pn.FILE_SINCE_DT as file_since_dt_pn,
nf.first as first, nf.first as first,
nf.middle as middle, nf.middle as middle,
nf.name_1 as name_1, nf.name_1 as name_1,