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

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
AlexSave 2025-04-24 16:33:06 +03:00
commit fbb0076e46
5 changed files with 5073 additions and 3680 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -629,6 +629,29 @@ public class Citizen extends TableImpl<CitizenRecord> {
*/
public final TableField<CitizenRecord, Boolean> IS_DEPUTY_CANDIDATE = createField(DSL.name("is_deputy_candidate"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "Признак статуса кандидата на выборах в депутаты");
/**
* The column
* <code>ervu_dashboard.citizen.has_criminal_liability_fz53</code>.
*/
public final TableField<CitizenRecord, Boolean> HAS_CRIMINAL_LIABILITY_FZ53 = createField(DSL.name("has_criminal_liability_fz53"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "");
/**
* The column <code>ervu_dashboard.citizen.has_liability_fz53</code>.
*/
public final TableField<CitizenRecord, Boolean> HAS_LIABILITY_FZ53 = createField(DSL.name("has_liability_fz53"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "");
/**
* The column
* <code>ervu_dashboard.citizen.has_appealing_violations_fz53</code>.
*/
public final TableField<CitizenRecord, Boolean> HAS_APPEALING_VIOLATIONS_FZ53 = createField(DSL.name("has_appealing_violations_fz53"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "");
/**
* The column <code>ervu_dashboard.citizen.has_tractor_license</code>.
* Признак наличия удостоверения водителя трактора
*/
public final TableField<CitizenRecord, Boolean> HAS_TRACTOR_LICENSE = createField(DSL.name("has_tractor_license"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "Признак наличия удостоверения водителя трактора");
private Citizen(Name alias, Table<CitizenRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}

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

@ -1570,6 +1570,68 @@ public class CitizenRecord extends UpdatableRecordImpl<CitizenRecord> {
return (Boolean) get(98);
}
/**
* Setter for
* <code>ervu_dashboard.citizen.has_criminal_liability_fz53</code>.
*/
public void setHasCriminalLiabilityFz53(Boolean value) {
set(99, value);
}
/**
* Getter for
* <code>ervu_dashboard.citizen.has_criminal_liability_fz53</code>.
*/
public Boolean getHasCriminalLiabilityFz53() {
return (Boolean) get(99);
}
/**
* Setter for <code>ervu_dashboard.citizen.has_liability_fz53</code>.
*/
public void setHasLiabilityFz53(Boolean value) {
set(100, value);
}
/**
* Getter for <code>ervu_dashboard.citizen.has_liability_fz53</code>.
*/
public Boolean getHasLiabilityFz53() {
return (Boolean) get(100);
}
/**
* Setter for
* <code>ervu_dashboard.citizen.has_appealing_violations_fz53</code>.
*/
public void setHasAppealingViolationsFz53(Boolean value) {
set(101, value);
}
/**
* Getter for
* <code>ervu_dashboard.citizen.has_appealing_violations_fz53</code>.
*/
public Boolean getHasAppealingViolationsFz53() {
return (Boolean) get(101);
}
/**
* Setter for <code>ervu_dashboard.citizen.has_tractor_license</code>.
* Признак наличия удостоверения водителя трактора
*/
public void setHasTractorLicense(Boolean value) {
set(102, value);
}
/**
* Getter for <code>ervu_dashboard.citizen.has_tractor_license</code>.
* Признак наличия удостоверения водителя трактора
*/
public Boolean getHasTractorLicense() {
return (Boolean) get(102);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@ -1593,7 +1655,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, 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, Timestamp updateDate, String countryBirth, String factIssuanceMilitaryRegistration, Date dateRegistration, Date dateDeregistration, Boolean personalData, String groundsExemption, Date startDateRight, Date endDateRight, String decisionNumber, Date startDateDecision, Date endDateDecision, String deferConscription, Boolean signDeferredRelease, String idErn, JSONB idEcia, UUID targetRecruitmentId, String systemPgsStatus, String defermentDecisionType, Boolean havingSportTitle, Boolean employed, Boolean activeRegIp, Boolean activeParentalLeave, Boolean selfEmployed, Boolean hasDisease, Boolean hasVich, Boolean registeredInPnd, Boolean hasDisability, Boolean isIncompetent, Boolean hasDeferment, Boolean hasDefermentRight, Boolean hasExemption, Boolean isGuardian, Integer minorsCount, Boolean hasDeadChild, Boolean hasMinorChild, Boolean hasRussianCitizenship, Boolean hasForeignCitizenship, Boolean hasGroundTransport, Boolean hasAirTransport, Boolean hasWaterTransport, Boolean hasProperty, Boolean hasDriverLicense, Boolean isDeputy, Boolean isDeputyCandidate) {
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, 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, Timestamp updateDate, String countryBirth, String factIssuanceMilitaryRegistration, Date dateRegistration, Date dateDeregistration, Boolean personalData, String groundsExemption, Date startDateRight, Date endDateRight, String decisionNumber, Date startDateDecision, Date endDateDecision, String deferConscription, Boolean signDeferredRelease, String idErn, JSONB idEcia, UUID targetRecruitmentId, String systemPgsStatus, String defermentDecisionType, Boolean havingSportTitle, Boolean employed, Boolean activeRegIp, Boolean activeParentalLeave, Boolean selfEmployed, Boolean hasDisease, Boolean hasVich, Boolean registeredInPnd, Boolean hasDisability, Boolean isIncompetent, Boolean hasDeferment, Boolean hasDefermentRight, Boolean hasExemption, Boolean isGuardian, Integer minorsCount, Boolean hasDeadChild, Boolean hasMinorChild, Boolean hasRussianCitizenship, Boolean hasForeignCitizenship, Boolean hasGroundTransport, Boolean hasAirTransport, Boolean hasWaterTransport, Boolean hasProperty, Boolean hasDriverLicense, Boolean isDeputy, Boolean isDeputyCandidate, Boolean hasCriminalLiabilityFz53, Boolean hasLiabilityFz53, Boolean hasAppealingViolationsFz53, Boolean hasTractorLicense) {
super(Citizen.CITIZEN);
setResidence(residence);
@ -1695,6 +1757,10 @@ public class CitizenRecord extends UpdatableRecordImpl<CitizenRecord> {
setHasDriverLicense(hasDriverLicense);
setIsDeputy(isDeputy);
setIsDeputyCandidate(isDeputyCandidate);
setHasCriminalLiabilityFz53(hasCriminalLiabilityFz53);
setHasLiabilityFz53(hasLiabilityFz53);
setHasAppealingViolationsFz53(hasAppealingViolationsFz53);
setHasTractorLicense(hasTractorLicense);
resetChangedOnNotNull();
}
}

2
config/micord.env
View file

@ -2,7 +2,7 @@ TZ=Europe/Moscow
# App datasource
DB_APP_USERNAME=ervu-dashboard
DB_APP_PASSWORD=ervu-dashboard
DB_APP_HOST=10.10.31.119
DB_APP_HOST=10.10.30.118
DB_APP_PORT=5432
DB_APP_NAME=ervu-dashboard-recr
ERVU_FILE_UPLOAD_XLSX_REQUIRED_HEADERS='Номер;Номер ЕПГУ;Источник;Верхнеуровневый ЛКО;Категория;Подкатегория;Факт;Организация, в которую поступило сообщение;Организация, в которой находится сообщение;Дата поступления;Дата планируемого завершения работ;Дата фактического завершения работ;Стадия;Статус;Просрочено;Фаст-трек;ФЗ;Тип решения;Направлено по email в ФОИВ, не подключенный к ПОС;Оценка ответа заявителем;Повторное рассмотрение;Организация координатора;ФИО координатора;Организация исполнителя;ФИО исполнителя;Организация руководителя;ФИО руководителя'

8508
resources/src/main/resources/business-model/citizen_all_filters.page
View file

File diff suppressed because it is too large Load diff

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

@ -1706,6 +1706,12 @@
<simple>null</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -3221,6 +3227,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -3899,6 +3911,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -4333,6 +4351,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -6946,6 +6970,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -8761,7 +8791,6 @@
<componentRootId>2d6e2dd1-013d-4c26-922c-c8d2d23c6e05</componentRootId>
<name>Filter group</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="3f5f352c-1a86-4702-a914-6c163c903157">
<properties>
@ -8771,6 +8800,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -17406,6 +17441,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -17737,6 +17778,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -18015,6 +18062,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -18334,6 +18387,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -18714,6 +18773,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -19022,6 +19087,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -21524,6 +21595,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -22176,6 +22253,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -22546,6 +22629,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -23012,6 +23101,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -23382,6 +23477,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -23451,7 +23552,6 @@
<componentRootId>76d71d2d-5560-4c25-90fa-3c6c87f30f93</componentRootId>
<name>Grid_water_vehicles</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="07201df9-ff33-4c71-9aae-a2cfdd028234">
<properties>
@ -27084,6 +27184,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -27424,6 +27530,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -27866,6 +27978,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -28536,6 +28654,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -29044,6 +29168,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -29504,6 +29634,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -29874,6 +30010,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>
@ -30580,6 +30722,12 @@
<simple>true</simple>
</value>
</entry>
<entry>
<key>skipInitialLoading</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>visible</key>
<value>