micord/ervu-lkrp-fl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SUPPORT-9540: add recruitment end date

Browse source
This commit is contained in:
gulnaz 2025-11-07 09:40:45 +03:00
parent 1453272c69
commit c85719eaa4
4 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
backend/src/main/java/ru/micord/ervu/converter/SummonsResponseDataConverter.java
View file

@ -47,6 +47,7 @@ public class SummonsResponseDataConverter {
? Integer.parseInt(recruitmentInfo.getRecruitmentStatusCode())
: 0)
.recruitmentStartDate(recruitmentInfo.getRecruitmentStart())
.recruitmentEndDate(recruitmentInfo.getRecruitmentEnd())
.residenceAddress(getAddressByCode(responseData.getAddressesList(), RESIDENCE_ADDRESS_CODE))
.stayAddress(getAddressByCode(responseData.getAddressesList(), STAY_ADDRESS_CODE))

12
backend/src/main/java/ru/micord/ervu/dto/SubpoenaResponseDto.java
View file

@ -20,7 +20,8 @@ public record SubpoenaResponseDto(String personName, String birthDate, String do
String estimatedDateSummons, List<Restriction> restrictions,
String firstRestrictionName, String firstRestrictionStartDate,
int otherRestrictionCount, int recruitmentStatusCode,
String recruitmentStartDate, int daysToAppearance) {
String recruitmentStartDate, String recruitmentEndDate,
int daysToAppearance) {
public static final class Builder {
String personName;
@ -49,6 +50,7 @@ public record SubpoenaResponseDto(String personName, String birthDate, String do
int otherRestrictionCount;
int recruitmentStatusCode;
String recruitmentStartDate;
String recruitmentEndDate;
int daysToAppearance;
public Builder() {
@ -192,6 +194,11 @@ public record SubpoenaResponseDto(String personName, String birthDate, String do
return this;
}
public Builder recruitmentEndDate(String recruitmentEndDate) {
this.recruitmentEndDate = recruitmentEndDate;
return this;
}
public Builder daysToAppearance(int days) {
this.daysToAppearance = days;
return this;
@ -203,7 +210,8 @@ public record SubpoenaResponseDto(String personName, String birthDate, String do
militaryCommissariatName, militaryCommissariatAddress, militaryCommissar,
placementDateSummons, reasonName, summonsStatusName, deliveryTypeSummonsName,
estimatedDateSummons, restrictions, firstRestrictionName, firstRestrictionStartDate,
otherRestrictionCount, recruitmentStatusCode, recruitmentStartDate, daysToAppearance);
otherRestrictionCount, recruitmentStatusCode, recruitmentStartDate, recruitmentEndDate,
daysToAppearance);
}
}
}

9
backend/src/main/resources/ProtoSummonsResponseData.proto
View file

@ -69,10 +69,11 @@ message RecruitmentInfo {
string recruitmentStatusCode = 3;
string recruitmentStatusName = 4;
string recruitmentStart = 5;
string recruitmentReasonCode = 6;
string recruitmentReasonName = 7;
bool recruitmentDocStatus = 8;
string recruitmentDocDate = 9;
string recruitmentEnd = 6;
string recruitmentReasonCode = 7;
string recruitmentReasonName = 8;
bool recruitmentDocStatus = 9;
string recruitmentDocDate = 10;
}
message ResponseDataAddress {

2
resources/src/main/resources/business-model/LK RP FL/screen-form-fl.page
View file

@ -4418,7 +4418,7 @@
<entry>
<key>id</key>
<value>
<simple>"recruitmentStartDate"</simple>
<simple>"recruitmentEndDate"</simple>
</value>
</entry>
</properties>