micord/evru-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/ERVU-234' into ERVU-234

Browse source
This commit is contained in:
Foat Saliakhov 2024-12-25 16:56:09 +03:00
commit 6f9616035c
3 changed files with 302 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

73
backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizen.java
View file

@ -370,6 +370,79 @@ public class Citizen extends TableImpl<CitizenRecord> {
*/
public final TableField<CitizenRecord, String> COUNTRY_BIRTH = createField(DSL.name("country_birth"), SQLDataType.VARCHAR, this, "Страна рождения");
/**
* The column
* <code>ervu_dashboard.citizen.fact_issuance_military_registration</code>.
* Сведения о факте выдачи документа воинского учета
*/
public final TableField<CitizenRecord, String> FACT_ISSUANCE_MILITARY_REGISTRATION = createField(DSL.name("fact_issuance_military_registration"), SQLDataType.VARCHAR, this, "Сведения о факте выдачи документа воинского учета");
/**
* The column <code>ervu_dashboard.citizen.date_registration</code>. Дата
* поставновки на учет
*/
public final TableField<CitizenRecord, Date> DATE_REGISTRATION = createField(DSL.name("date_registration"), SQLDataType.DATE, this, "Дата поставновки на учет");
/**
* The column <code>ervu_dashboard.citizen.date_deregistration</code>. Дата
* снятия с учета
*/
public final TableField<CitizenRecord, Date> DATE_DEREGISTRATION = createField(DSL.name("date_deregistration"), SQLDataType.DATE, this, "Дата снятия с учета");
/**
* The column <code>ervu_dashboard.citizen.personal_data</code>. Получено
* согласие на обработку персональных данных
*/
public final TableField<CitizenRecord, Boolean> PERSONAL_DATA = createField(DSL.name("personal_data"), SQLDataType.BOOLEAN, this, "Получено согласие на обработку персональных данных");
/**
* The column <code>ervu_dashboard.citizen.grounds_exemption</code>. Наличие
* у гражданина основания для освобождения от призыва
*/
public final TableField<CitizenRecord, String> GROUNDS_EXEMPTION = createField(DSL.name("grounds_exemption"), SQLDataType.VARCHAR, this, "Наличие у гражданина основания для освобождения от призыва");
/**
* The column <code>ervu_dashboard.citizen.start_date_right</code>. Дата
* начала действия права
*/
public final TableField<CitizenRecord, Date> START_DATE_RIGHT = createField(DSL.name("start_date_right"), SQLDataType.DATE, this, "Дата начала действия права");
/**
* The column <code>ervu_dashboard.citizen.end_date_right</code>. Дата
* окончания действия права
*/
public final TableField<CitizenRecord, Date> END_DATE_RIGHT = createField(DSL.name("end_date_right"), SQLDataType.DATE, this, "Дата окончания действия права");
/**
* The column <code>ervu_dashboard.citizen.decision_number</code>. Номер
* решения
*/
public final TableField<CitizenRecord, String> DECISION_NUMBER = createField(DSL.name("decision_number"), SQLDataType.VARCHAR, this, "Номер решения");
/**
* The column <code>ervu_dashboard.citizen.start_date_decision</code>. Дата
* начала действия решения
*/
public final TableField<CitizenRecord, Date> START_DATE_DECISION = createField(DSL.name("start_date_decision"), SQLDataType.DATE, this, "Дата начала действия решения");
/**
* The column <code>ervu_dashboard.citizen.end_date_decision</code>. Дата
* окончания действия решения
*/
public final TableField<CitizenRecord, Date> END_DATE_DECISION = createField(DSL.name("end_date_decision"), SQLDataType.DATE, this, "Дата окончания действия решения");
/**
* The column <code>ervu_dashboard.citizen.sign_deferred_release</code>.
* Признак наличия отсрочки или освобождения от призыва
*/
public final TableField<CitizenRecord, String> SIGN_DEFERRED_RELEASE = createField(DSL.name("sign_deferred_release"), SQLDataType.VARCHAR, this, "Признак наличия отсрочки или освобождения от призыва");
/**
* The column <code>ervu_dashboard.citizen.defer_conscription</code>.
* Наличие у гражданина основания для отсрочки от призыва
*/
public final TableField<CitizenRecord, String> DEFER_CONSCRIPTION = createField(DSL.name("defer_conscription"), SQLDataType.VARCHAR, this, "Наличие у гражданина основания для отсрочки от призыва");
private Citizen(Name alias, Table<CitizenRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}

208
backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenRecord.java
View file

@ -881,6 +881,200 @@ public class CitizenRecord extends UpdatableRecordImpl<CitizenRecord> {
return (String) get(55);
}
/**
* Setter for
* <code>ervu_dashboard.citizen.fact_issuance_military_registration</code>.
* Сведения о факте выдачи документа воинского учета
*/
public void setFactIssuanceMilitaryRegistration(String value) {
set(56, value);
}
/**
* Getter for
* <code>ervu_dashboard.citizen.fact_issuance_military_registration</code>.
* Сведения о факте выдачи документа воинского учета
*/
public String getFactIssuanceMilitaryRegistration() {
return (String) get(56);
}
/**
* Setter for <code>ervu_dashboard.citizen.date_registration</code>. Дата
* поставновки на учет
*/
public void setDateRegistration(Date value) {
set(57, value);
}
/**
* Getter for <code>ervu_dashboard.citizen.date_registration</code>. Дата
* поставновки на учет
*/
public Date getDateRegistration() {
return (Date) get(57);
}
/**
* Setter for <code>ervu_dashboard.citizen.date_deregistration</code>. Дата
* снятия с учета
*/
public void setDateDeregistration(Date value) {
set(58, value);
}
/**
* Getter for <code>ervu_dashboard.citizen.date_deregistration</code>. Дата
* снятия с учета
*/
public Date getDateDeregistration() {
return (Date) get(58);
}
/**
* Setter for <code>ervu_dashboard.citizen.personal_data</code>. Получено
* согласие на обработку персональных данных
*/
public void setPersonalData(Boolean value) {
set(59, value);
}
/**
* Getter for <code>ervu_dashboard.citizen.personal_data</code>. Получено
* согласие на обработку персональных данных
*/
public Boolean getPersonalData() {
return (Boolean) get(59);
}
/**
* Setter for <code>ervu_dashboard.citizen.grounds_exemption</code>. Наличие
* у гражданина основания для освобождения от призыва
*/
public void setGroundsExemption(String value) {
set(60, value);
}
/**
* Getter for <code>ervu_dashboard.citizen.grounds_exemption</code>. Наличие
* у гражданина основания для освобождения от призыва
*/
public String getGroundsExemption() {
return (String) get(60);
}
/**
* Setter for <code>ervu_dashboard.citizen.start_date_right</code>. Дата
* начала действия права
*/
public void setStartDateRight(Date value) {
set(61, value);
}
/**
* Getter for <code>ervu_dashboard.citizen.start_date_right</code>. Дата
* начала действия права
*/
public Date getStartDateRight() {
return (Date) get(61);
}
/**
* Setter for <code>ervu_dashboard.citizen.end_date_right</code>. Дата
* окончания действия права
*/
public void setEndDateRight(Date value) {
set(62, value);
}
/**
* Getter for <code>ervu_dashboard.citizen.end_date_right</code>. Дата
* окончания действия права
*/
public Date getEndDateRight() {
return (Date) get(62);
}
/**
* Setter for <code>ervu_dashboard.citizen.decision_number</code>. Номер
* решения
*/
public void setDecisionNumber(String value) {
set(63, value);
}
/**
* Getter for <code>ervu_dashboard.citizen.decision_number</code>. Номер
* решения
*/
public String getDecisionNumber() {
return (String) get(63);
}
/**
* Setter for <code>ervu_dashboard.citizen.start_date_decision</code>. Дата
* начала действия решения
*/
public void setStartDateDecision(Date value) {
set(64, value);
}
/**
* Getter for <code>ervu_dashboard.citizen.start_date_decision</code>. Дата
* начала действия решения
*/
public Date getStartDateDecision() {
return (Date) get(64);
}
/**
* Setter for <code>ervu_dashboard.citizen.end_date_decision</code>. Дата
* окончания действия решения
*/
public void setEndDateDecision(Date value) {
set(65, value);
}
/**
* Getter for <code>ervu_dashboard.citizen.end_date_decision</code>. Дата
* окончания действия решения
*/
public Date getEndDateDecision() {
return (Date) get(65);
}
/**
* Setter for <code>ervu_dashboard.citizen.sign_deferred_release</code>.
* Признак наличия отсрочки или освобождения от призыва
*/
public void setSignDeferredRelease(String value) {
set(66, value);
}
/**
* Getter for <code>ervu_dashboard.citizen.sign_deferred_release</code>.
* Признак наличия отсрочки или освобождения от призыва
*/
public String getSignDeferredRelease() {
return (String) get(66);
}
/**
* Setter for <code>ervu_dashboard.citizen.defer_conscription</code>.
* Наличие у гражданина основания для отсрочки от призыва
*/
public void setDeferConscription(String value) {
set(67, value);
}
/**
* Getter for <code>ervu_dashboard.citizen.defer_conscription</code>.
* Наличие у гражданина основания для отсрочки от призыва
*/
public String getDeferConscription() {
return (String) get(67);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@ -904,7 +1098,7 @@ public class CitizenRecord extends UpdatableRecordImpl<CitizenRecord> {
/**
* Create a detached, initialised CitizenRecord
*/
public CitizenRecord(String residence, String isRegistered, String passportSeries, String passportNumber, String phone, String medicalRequirements, String defermentLiberation, String gender, String maritalStatus, String education, String employment, String reasonRegistration, String driverLicense, String disabilityGroup, String dispensaryRegistrationCode, String regionBirth, String cityBirth, Boolean rightDeferment, Boolean tookBreak, Boolean medic, Boolean sportsCategory, Boolean tractorLicense, Boolean isWanted, Boolean isInPrison, Boolean acquiredCitizenship, Boolean urgentService, Boolean contractService, Boolean mobilization, String fullName, String lastName, String firstName, String middleName, BigDecimal age, String birthPlace, BigDecimal numberChildren, Date birthDate, UUID recruitId, UUID recruitmentId, Date issueDate, BigDecimal numberChildren_18Old, Timestamp updateDate, String snils, String inn, String email, Date diedDate, Date startDateResidence, Date endDateResidence, String addressPlaceStay, Date startDatePlaceStay, Date endDatePlaceStay, String typePlaceStay, String addressActual, String sourceInfoActual, Date dateInfoActual, Date dateLossInfoActual, String countryBirth) {
public CitizenRecord(String residence, String isRegistered, String passportSeries, String passportNumber, String phone, String medicalRequirements, String defermentLiberation, String gender, String maritalStatus, String education, String employment, String reasonRegistration, String driverLicense, String disabilityGroup, String dispensaryRegistrationCode, String regionBirth, String cityBirth, Boolean rightDeferment, Boolean tookBreak, Boolean medic, Boolean sportsCategory, Boolean tractorLicense, Boolean isWanted, Boolean isInPrison, Boolean acquiredCitizenship, Boolean urgentService, Boolean contractService, Boolean mobilization, String fullName, String lastName, String firstName, String middleName, BigDecimal age, String birthPlace, BigDecimal numberChildren, Date birthDate, UUID recruitId, UUID recruitmentId, Date issueDate, BigDecimal numberChildren_18Old, Timestamp updateDate, String snils, String inn, String email, Date diedDate, Date startDateResidence, Date endDateResidence, String addressPlaceStay, Date startDatePlaceStay, Date endDatePlaceStay, String typePlaceStay, String addressActual, String sourceInfoActual, Date dateInfoActual, Date dateLossInfoActual, String countryBirth, String factIssuanceMilitaryRegistration, Date dateRegistration, Date dateDeregistration, Boolean personalData, String groundsExemption, Date startDateRight, Date endDateRight, String decisionNumber, Date startDateDecision, Date endDateDecision, String signDeferredRelease, String deferConscription) {
super(Citizen.CITIZEN);
setResidence(residence);
@ -963,6 +1157,18 @@ public class CitizenRecord extends UpdatableRecordImpl<CitizenRecord> {
setDateInfoActual(dateInfoActual);
setDateLossInfoActual(dateLossInfoActual);
setCountryBirth(countryBirth);
setFactIssuanceMilitaryRegistration(factIssuanceMilitaryRegistration);
setDateRegistration(dateRegistration);
setDateDeregistration(dateDeregistration);
setPersonalData(personalData);
setGroundsExemption(groundsExemption);
setStartDateRight(startDateRight);
setEndDateRight(endDateRight);
setDecisionNumber(decisionNumber);
setStartDateDecision(startDateDecision);
setEndDateDecision(endDateDecision);
setSignDeferredRelease(signDeferredRelease);
setDeferConscription(deferConscription);
resetChangedOnNotNull();
}
}

54
resources/src/main/resources/business-model/citizencard.page
View file

@ -1533,6 +1533,7 @@
<componentRootId>999acadc-8a62-45b9-ae62-9d653411fdb6</componentRootId>
<name>Личные сведения</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties>
@ -3063,13 +3064,6 @@
</properties>
</scripts>
</children>
<children id="45751794-54f0-4870-8ef3-4188c52f3ee2">
<prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
<componentRootId>45751794-54f0-4870-8ef3-4188c52f3ee2</componentRootId>
<name>Место фактического проживания</name>
<container>false</container>
<removed>true</removed>
</children>
</children>
</children>
</children>
@ -4513,7 +4507,6 @@
<componentRootId>e4cd4207-0390-4893-a30b-c1c77f9dec95</componentRootId>
<name>Сведения о воинском учете</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties>
@ -4644,12 +4637,11 @@
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
<properties>
<entry>
<key>columnForSave</key>
<value>
<simple>null</simple>
<simple>{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"code"}</simple>
</value>
</entry>
</properties>
@ -4893,7 +4885,7 @@
<entry>
<key>columnForSave</key>
<value>
<simple>null</simple>
<simple>{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"date_registration"}</simple>
</value>
</entry>
</properties>
@ -5041,7 +5033,7 @@
<entry>
<key>columnForSave</key>
<value>
<simple>null</simple>
<simple>{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"personal_data"}</simple>
</value>
</entry>
</properties>
@ -5112,7 +5104,7 @@
<entry>
<key>columnForSave</key>
<value>
<simple>null</simple>
<simple>{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"date_deregistration"}</simple>
</value>
</entry>
</properties>
@ -5190,12 +5182,11 @@
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
<properties>
<entry>
<key>columnForSave</key>
<value>
<simple>null</simple>
<simple>{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"fact_issuance_military_registration"}</simple>
</value>
</entry>
</properties>
@ -5515,12 +5506,11 @@
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
<properties>
<entry>
<key>columnForSave</key>
<value>
<simple>null</simple>
<simple>{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"defer_conscription"}</simple>
</value>
</entry>
</properties>
@ -5592,7 +5582,14 @@
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
<properties>
<entry>
<key>columnForSave</key>
<value>
<simple>{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"grounds_exemption"}</simple>
</value>
</entry>
</properties>
</scripts>
</children>
<children id="3c0200e3-fd67-44f6-ad4d-e869ee759df5">
@ -5666,12 +5663,11 @@
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
<properties>
<entry>
<key>columnForSave</key>
<value>
<simple>null</simple>
<simple>{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"start_date_right"}</simple>
</value>
</entry>
</properties>
@ -5737,12 +5733,11 @@
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
<properties>
<entry>
<key>columnForSave</key>
<value>
<simple>null</simple>
<simple>{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"end_date_right"}</simple>
</value>
</entry>
</properties>
@ -5911,12 +5906,11 @@
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
<properties>
<entry>
<key>columnForSave</key>
<value>
<simple>null</simple>
<simple>{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"deferment_liberation"}</simple>
</value>
</entry>
</properties>
@ -5993,12 +5987,11 @@
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
<properties>
<entry>
<key>columnForSave</key>
<value>
<simple>null</simple>
<simple>{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"decision_number"}</simple>
</value>
</entry>
</properties>
@ -6064,12 +6057,11 @@
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
<properties>
<entry>
<key>columnForSave</key>
<value>
<simple>null</simple>
<simple>{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"start_date_decision"}</simple>
</value>
</entry>
</properties>
@ -6135,12 +6127,11 @@
<scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
<scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
<scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
<enabled>false</enabled>
<properties>
<entry>
<key>columnForSave</key>
<value>
<simple>null</simple>
<simple>{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"end_date_decision"}</simple>
</value>
</entry>
</properties>
@ -6610,7 +6601,6 @@
<componentRootId>70b5fdb0-1560-4632-8f1e-116f81565b8b</componentRootId>
<name>Повестки и временные меры</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties>
@ -6753,7 +6743,6 @@
<componentRootId>cc6b7841-e84d-4d33-bc8f-3c3830a566db</componentRootId>
<name>Таблица - повестки</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="07201df9-ff33-4c71-9aae-a2cfdd028234">
<properties>
@ -9455,6 +9444,7 @@
<componentRootId>605c52a6-7bf9-431a-a7fc-c60a80fdbf22</componentRootId>
<name>Сведения об образовании и полученных дипломах</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
<properties>