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

правки в образовании

Browse source
This commit is contained in:
Булат Хайруллин 2025-05-27 16:27:51 +03:00
parent 6dff3a2fd2
commit 0d11d25b59
15 changed files with 1569 additions and 399 deletions
Download patch file Download diff file Expand all files Collapse all files

7
backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/Keys.java
View file

@ -205,13 +205,6 @@ public class Keys {
public static final ForeignKey<CitizenDefermentRecord, DefermentReasonRecord> CITIZEN_DEFERMENT__CITIZEN_DEFERMENT_DEFERMENT_REASON_CODE_FK = Internal.createForeignKey(CitizenDeferment.CITIZEN_DEFERMENT, DSL.name("citizen_deferment_deferment_reason_code_fk"), new TableField[] { CitizenDeferment.CITIZEN_DEFERMENT.REASON_CODE }, Keys.DEFERMENT_REASON_CODE_UNIQUE_KEY, new TableField[] { DefermentReason.DEFERMENT_REASON.CODE }, true);
public static final ForeignKey<CitizenDefermentRightRecord, DefermentReasonRecord> CITIZEN_DEFERMENT_RIGHT__CITIZEN_DEFERMENT_RIGHT_DEFERMENT_REASON_CODE_FK = Internal.createForeignKey(CitizenDefermentRight.CITIZEN_DEFERMENT_RIGHT, DSL.name("citizen_deferment_right_deferment_reason_code_fk"), new TableField[] { CitizenDefermentRight.CITIZEN_DEFERMENT_RIGHT.CODE }, Keys.DEFERMENT_REASON_CODE_UNIQUE_KEY, new TableField[] { DefermentReason.DEFERMENT_REASON.CODE }, true);
public static final ForeignKey<CitizenEducationRecord, EducationFormRecord> CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_FORM_CODE_FK = Internal.createForeignKey(CitizenEducation.CITIZEN_EDUCATION, DSL.name("citizen_education_education_form_code_fk"), new TableField[] { CitizenEducation.CITIZEN_EDUCATION.EDUCATION_FORM_CODE }, Keys.EDUCATION_FORM_CODE_UNIQUE_KEY, new TableField[] { EducationForm.EDUCATION_FORM.CODE }, true);
public static final ForeignKey<CitizenEducationRecord, EducationInstitutionTypeRecord> CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_INSTITUTION_TYPE_CODE_FK = Internal.createForeignKey(CitizenEducation.CITIZEN_EDUCATION, DSL.name("citizen_education_education_institution_type_code_fk"), new TableField[] { CitizenEducation.CITIZEN_EDUCATION.EDUCATIONAL_INSTITUTION_TYPE_CODE }, Keys.EDUCATION_INSTITUTION_TYPE_CODE_UNIQUE_KEY, new TableField[] { EducationInstitutionType.EDUCATION_INSTITUTION_TYPE.CODE }, true);
public static final ForeignKey<CitizenEducationRecord, EducationLeaveReasonRecord> CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_LEAVE_REASON_CODE_FK = Internal.createForeignKey(CitizenEducation.CITIZEN_EDUCATION, DSL.name("citizen_education_education_leave_reason_code_fk"), new TableField[] { CitizenEducation.CITIZEN_EDUCATION.LEAVE_REASON_CODE }, Keys.EDUCATION_LEAVE_REASON_CODE_UNIQUE_KEY, new TableField[] { EducationLeaveReason.EDUCATION_LEAVE_REASON.CODE }, true);
public static final ForeignKey<CitizenEducationRecord, EducationLevelRecord> CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_LEVEL_CODE_FK = Internal.createForeignKey(CitizenEducation.CITIZEN_EDUCATION, DSL.name("citizen_education_education_level_code_fk"), new TableField[] { CitizenEducation.CITIZEN_EDUCATION.EDUCATION_LEVEL_CODE }, Keys.EDUCATION_LEVEL_CODE_UNIQUE_KEY, new TableField[] { EducationLevel.EDUCATION_LEVEL.CODE }, true);
public static final ForeignKey<CitizenEducationRecord, EducationMinobrSpecialityRecord> CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_MINOBR_SPECIALITY_CODE_FK = Internal.createForeignKey(CitizenEducation.CITIZEN_EDUCATION, DSL.name("citizen_education_education_minobr_speciality_code_fk"), new TableField[] { CitizenEducation.CITIZEN_EDUCATION.MINOBR_SPEC_CODE }, Keys.EDUCATION_MINOBR_SPECIALITY_CODE_UNIQUE_KEY, new TableField[] { EducationMinobrSpeciality.EDUCATION_MINOBR_SPECIALITY.CODE }, true);
public static final ForeignKey<CitizenEducationRecord, EducationMinprosvSpecialityRecord> CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_MINPROSV_SPECIALITY_CODE_FK = Internal.createForeignKey(CitizenEducation.CITIZEN_EDUCATION, DSL.name("citizen_education_education_minprosv_speciality_code_fk"), new TableField[] { CitizenEducation.CITIZEN_EDUCATION.MINPROSV_SPEC_CODE }, Keys.EDUCATION_MINPROSV_SPECIALITY_CODE_UNIQUE_KEY, new TableField[] { EducationMinprosvSpeciality.EDUCATION_MINPROSV_SPECIALITY.CODE }, true);
public static final ForeignKey<CitizenEducationRecord, EducationStatusRecord> CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_STATUS_TYPE_CODE_FK = Internal.createForeignKey(CitizenEducation.CITIZEN_EDUCATION, DSL.name("citizen_education_education_status_type_code_fk"), new TableField[] { CitizenEducation.CITIZEN_EDUCATION.EDUCATION_STATUS_CODE }, Keys.EDUCATION_STATUS_CODE_UNIQUE_KEY, new TableField[] { EducationStatus.EDUCATION_STATUS.CODE }, true);
public static final ForeignKey<CitizenEducationDiplomaRecord, EducationMinprosvDocTypeRecord> CITIZEN_EDUCATION_DIPLOMA__CITIZEN_EDUCATION_DIPLOMA_DOC_TYPE_CODE_MINPROSV_CODE_FK = Internal.createForeignKey(CitizenEducationDiploma.CITIZEN_EDUCATION_DIPLOMA, DSL.name("citizen_education_diploma_doc_type_code_minprosv_code_fk"), new TableField[] { CitizenEducationDiploma.CITIZEN_EDUCATION_DIPLOMA.DOC_TYPE_CODE_MINPROSV }, Keys.EDUCATION_MINPROSV_DOC_TYPE_CODE_UNIQUE_KEY, new TableField[] { EducationMinprosvDocType.EDUCATION_MINPROSV_DOC_TYPE.CODE }, true);
public static final ForeignKey<CitizenEducationDiplomaRecord, EducationLevelRecord> CITIZEN_EDUCATION_DIPLOMA__CITIZEN_EDUCATION_DIPLOMA_EDUCATION_LEVEL_CODE_FK = Internal.createForeignKey(CitizenEducationDiploma.CITIZEN_EDUCATION_DIPLOMA, DSL.name("citizen_education_diploma_education_level_code_fk"), new TableField[] { CitizenEducationDiploma.CITIZEN_EDUCATION_DIPLOMA.EDUCATION_LEVEL_CODE }, Keys.EDUCATION_LEVEL_CODE_UNIQUE_KEY, new TableField[] { EducationLevel.EDUCATION_LEVEL.CODE }, true);
public static final ForeignKey<CitizenEducationDiplomaRecord, EducationMinobrSpecialityRecord> CITIZEN_EDUCATION_DIPLOMA__CITIZEN_EDUCATION_DIPLOMA_EDUCATION_MINOBR_SPECIALITY_CODE_FK = Internal.createForeignKey(CitizenEducationDiploma.CITIZEN_EDUCATION_DIPLOMA, DSL.name("citizen_education_diploma_education_minobr_speciality_code_fk"), new TableField[] { CitizenEducationDiploma.CITIZEN_EDUCATION_DIPLOMA.EDUCATION_SPECIALITY_MINPOBR_CODE }, Keys.EDUCATION_MINOBR_SPECIALITY_CODE_UNIQUE_KEY, new TableField[] { EducationMinobrSpeciality.EDUCATION_MINOBR_SPECIALITY.CODE }, true);

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

@ -709,6 +709,44 @@ public class Citizen extends TableImpl<CitizenRecord> {
*/
public final TableField<CitizenRecord, Boolean> HAS_ACTIVE_TEMPORARY_MEASURE = createField(DSL.name("has_active_temporary_measure"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "Признак наличия примененных временных мер");
/**
* The column <code>ervu_dashboard.citizen.system_esia_id</code>.
*/
public final TableField<CitizenRecord, String> SYSTEM_ESIA_ID = createField(DSL.name("system_esia_id"), SQLDataType.VARCHAR, this, "");
/**
* The column <code>ervu_dashboard.citizen.educated</code>.
*/
public final TableField<CitizenRecord, Boolean> EDUCATED = createField(DSL.name("educated"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "");
/**
* The column <code>ervu_dashboard.citizen.has_education_diploma</code>.
*/
public final TableField<CitizenRecord, Boolean> HAS_EDUCATION_DIPLOMA = createField(DSL.name("has_education_diploma"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "");
/**
* The column
* <code>ervu_dashboard.citizen.has_foreign_education_diploma</code>.
*/
public final TableField<CitizenRecord, Boolean> HAS_FOREIGN_EDUCATION_DIPLOMA = createField(DSL.name("has_foreign_education_diploma"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "");
/**
* The column
* <code>ervu_dashboard.citizen.has_military_department_education</code>.
*/
public final TableField<CitizenRecord, Boolean> HAS_MILITARY_DEPARTMENT_EDUCATION = createField(DSL.name("has_military_department_education"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "");
/**
* The column
* <code>ervu_dashboard.citizen.has_military_training_center_education</code>.
*/
public final TableField<CitizenRecord, Boolean> HAS_MILITARY_TRAINING_CENTER_EDUCATION = createField(DSL.name("has_military_training_center_education"), SQLDataType.BOOLEAN.nullable(false).defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "");
/**
* The column <code>ervu_dashboard.citizen.has_actual_academic_leave</code>.
*/
public final TableField<CitizenRecord, Boolean> HAS_ACTUAL_ACADEMIC_LEAVE = createField(DSL.name("has_actual_academic_leave"), 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);
}

152
backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/CitizenEducation.java
View file

@ -5,21 +5,15 @@ package ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables;
import java.sql.Date;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.UUID;
import org.jooq.Condition;
import org.jooq.Field;
import org.jooq.ForeignKey;
import org.jooq.Identity;
import org.jooq.InverseForeignKey;
import org.jooq.Name;
import org.jooq.Path;
import org.jooq.PlainSQL;
import org.jooq.QueryPart;
import org.jooq.Record;
import org.jooq.SQL;
import org.jooq.Schema;
import org.jooq.Select;
@ -34,13 +28,6 @@ import org.jooq.impl.TableImpl;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.Keys;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.EducationForm.EducationFormPath;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.EducationInstitutionType.EducationInstitutionTypePath;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.EducationLeaveReason.EducationLeaveReasonPath;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.EducationLevel.EducationLevelPath;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.EducationMinobrSpeciality.EducationMinobrSpecialityPath;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.EducationMinprosvSpeciality.EducationMinprosvSpecialityPath;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.EducationStatus.EducationStatusPath;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenEducationRecord;
@ -276,6 +263,18 @@ public class CitizenEducation extends TableImpl<CitizenEducationRecord> {
*/
public final TableField<CitizenEducationRecord, String> ADMISSION_ORDER_NUMBER = createField(DSL.name("admission_order_number"), SQLDataType.VARCHAR, this, "Номер приказа о зачислении");
/**
* The column
* <code>ervu_dashboard.citizen_education.military_department_education_start_date</code>.
*/
public final TableField<CitizenEducationRecord, Date> MILITARY_DEPARTMENT_EDUCATION_START_DATE = createField(DSL.name("military_department_education_start_date"), SQLDataType.DATE, this, "");
/**
* The column
* <code>ervu_dashboard.citizen_education.military_department_education_end_date</code>.
*/
public final TableField<CitizenEducationRecord, Date> MILITARY_DEPARTMENT_EDUCATION_END_DATE = createField(DSL.name("military_department_education_end_date"), SQLDataType.DATE, this, "");
private CitizenEducation(Name alias, Table<CitizenEducationRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}
@ -307,37 +306,6 @@ public class CitizenEducation extends TableImpl<CitizenEducationRecord> {
this(DSL.name("citizen_education"), null);
}
public <O extends Record> CitizenEducation(Table<O> path, ForeignKey<O, CitizenEducationRecord> childPath, InverseForeignKey<O, CitizenEducationRecord> parentPath) {
super(path, childPath, parentPath, CITIZEN_EDUCATION);
}
/**
* A subtype implementing {@link Path} for simplified path-based joins.
*/
public static class CitizenEducationPath extends CitizenEducation implements Path<CitizenEducationRecord> {
public <O extends Record> CitizenEducationPath(Table<O> path, ForeignKey<O, CitizenEducationRecord> childPath, InverseForeignKey<O, CitizenEducationRecord> parentPath) {
super(path, childPath, parentPath);
}
private CitizenEducationPath(Name alias, Table<CitizenEducationRecord> aliased) {
super(alias, aliased);
}
@Override
public CitizenEducationPath as(String alias) {
return new CitizenEducationPath(DSL.name(alias), this);
}
@Override
public CitizenEducationPath as(Name alias) {
return new CitizenEducationPath(alias, this);
}
@Override
public CitizenEducationPath as(Table<?> alias) {
return new CitizenEducationPath(alias.getQualifiedName(), this);
}
}
@Override
public Schema getSchema() {
return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD;
@ -353,102 +321,6 @@ public class CitizenEducation extends TableImpl<CitizenEducationRecord> {
return Keys.CITIZEN_EDUCATION_PKEY;
}
@Override
public List<ForeignKey<CitizenEducationRecord, ?>> getReferences() {
return Arrays.asList(Keys.CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_INSTITUTION_TYPE_CODE_FK, Keys.CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_STATUS_TYPE_CODE_FK, Keys.CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_LEVEL_CODE_FK, Keys.CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_LEAVE_REASON_CODE_FK, Keys.CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_FORM_CODE_FK, Keys.CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_MINOBR_SPECIALITY_CODE_FK, Keys.CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_MINPROSV_SPECIALITY_CODE_FK);
}
private transient EducationInstitutionTypePath _educationInstitutionType;
/**
* Get the implicit join path to the
* <code>ervu_dashboard.education_institution_type</code> table.
*/
public EducationInstitutionTypePath educationInstitutionType() {
if (_educationInstitutionType == null)
_educationInstitutionType = new EducationInstitutionTypePath(this, Keys.CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_INSTITUTION_TYPE_CODE_FK, null);
return _educationInstitutionType;
}
private transient EducationStatusPath _educationStatus;
/**
* Get the implicit join path to the
* <code>ervu_dashboard.education_status</code> table.
*/
public EducationStatusPath educationStatus() {
if (_educationStatus == null)
_educationStatus = new EducationStatusPath(this, Keys.CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_STATUS_TYPE_CODE_FK, null);
return _educationStatus;
}
private transient EducationLevelPath _educationLevel;
/**
* Get the implicit join path to the
* <code>ervu_dashboard.education_level</code> table.
*/
public EducationLevelPath educationLevel() {
if (_educationLevel == null)
_educationLevel = new EducationLevelPath(this, Keys.CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_LEVEL_CODE_FK, null);
return _educationLevel;
}
private transient EducationLeaveReasonPath _educationLeaveReason;
/**
* Get the implicit join path to the
* <code>ervu_dashboard.education_leave_reason</code> table.
*/
public EducationLeaveReasonPath educationLeaveReason() {
if (_educationLeaveReason == null)
_educationLeaveReason = new EducationLeaveReasonPath(this, Keys.CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_LEAVE_REASON_CODE_FK, null);
return _educationLeaveReason;
}
private transient EducationFormPath _educationForm;
/**
* Get the implicit join path to the
* <code>ervu_dashboard.education_form</code> table.
*/
public EducationFormPath educationForm() {
if (_educationForm == null)
_educationForm = new EducationFormPath(this, Keys.CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_FORM_CODE_FK, null);
return _educationForm;
}
private transient EducationMinobrSpecialityPath _educationMinobrSpeciality;
/**
* Get the implicit join path to the
* <code>ervu_dashboard.education_minobr_speciality</code> table.
*/
public EducationMinobrSpecialityPath educationMinobrSpeciality() {
if (_educationMinobrSpeciality == null)
_educationMinobrSpeciality = new EducationMinobrSpecialityPath(this, Keys.CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_MINOBR_SPECIALITY_CODE_FK, null);
return _educationMinobrSpeciality;
}
private transient EducationMinprosvSpecialityPath _educationMinprosvSpeciality;
/**
* Get the implicit join path to the
* <code>ervu_dashboard.education_minprosv_speciality</code> table.
*/
public EducationMinprosvSpecialityPath educationMinprosvSpeciality() {
if (_educationMinprosvSpeciality == null)
_educationMinprosvSpeciality = new EducationMinprosvSpecialityPath(this, Keys.CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_MINPROSV_SPECIALITY_CODE_FK, null);
return _educationMinprosvSpeciality;
}
@Override
public CitizenEducation as(String alias) {
return new CitizenEducation(DSL.name(alias), this);

49
backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/EducationForm.java
View file

@ -10,14 +10,10 @@ import java.util.List;
import org.jooq.Condition;
import org.jooq.Field;
import org.jooq.ForeignKey;
import org.jooq.Identity;
import org.jooq.InverseForeignKey;
import org.jooq.Name;
import org.jooq.Path;
import org.jooq.PlainSQL;
import org.jooq.QueryPart;
import org.jooq.Record;
import org.jooq.SQL;
import org.jooq.Schema;
import org.jooq.Select;
@ -32,7 +28,6 @@ import org.jooq.impl.TableImpl;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.Keys;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenEducation.CitizenEducationPath;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.EducationFormRecord;
@ -116,37 +111,6 @@ public class EducationForm extends TableImpl<EducationFormRecord> {
this(DSL.name("education_form"), null);
}
public <O extends Record> EducationForm(Table<O> path, ForeignKey<O, EducationFormRecord> childPath, InverseForeignKey<O, EducationFormRecord> parentPath) {
super(path, childPath, parentPath, EDUCATION_FORM);
}
/**
* A subtype implementing {@link Path} for simplified path-based joins.
*/
public static class EducationFormPath extends EducationForm implements Path<EducationFormRecord> {
public <O extends Record> EducationFormPath(Table<O> path, ForeignKey<O, EducationFormRecord> childPath, InverseForeignKey<O, EducationFormRecord> parentPath) {
super(path, childPath, parentPath);
}
private EducationFormPath(Name alias, Table<EducationFormRecord> aliased) {
super(alias, aliased);
}
@Override
public EducationFormPath as(String alias) {
return new EducationFormPath(DSL.name(alias), this);
}
@Override
public EducationFormPath as(Name alias) {
return new EducationFormPath(alias, this);
}
@Override
public EducationFormPath as(Table<?> alias) {
return new EducationFormPath(alias.getQualifiedName(), this);
}
}
@Override
public Schema getSchema() {
return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD;
@ -167,19 +131,6 @@ public class EducationForm extends TableImpl<EducationFormRecord> {
return Arrays.asList(Keys.EDUCATION_FORM_CODE_UNIQUE_KEY);
}
private transient CitizenEducationPath _citizenEducation;
/**
* Get the implicit to-many join path to the
* <code>ervu_dashboard.citizen_education</code> table
*/
public CitizenEducationPath citizenEducation() {
if (_citizenEducation == null)
_citizenEducation = new CitizenEducationPath(this, null, Keys.CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_FORM_CODE_FK.getInverseKey());
return _citizenEducation;
}
@Override
public EducationForm as(String alias) {
return new EducationForm(DSL.name(alias), this);

49
backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/EducationInstitutionType.java
View file

@ -10,14 +10,10 @@ import java.util.List;
import org.jooq.Condition;
import org.jooq.Field;
import org.jooq.ForeignKey;
import org.jooq.Identity;
import org.jooq.InverseForeignKey;
import org.jooq.Name;
import org.jooq.Path;
import org.jooq.PlainSQL;
import org.jooq.QueryPart;
import org.jooq.Record;
import org.jooq.SQL;
import org.jooq.Schema;
import org.jooq.Select;
@ -32,7 +28,6 @@ import org.jooq.impl.TableImpl;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.Keys;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenEducation.CitizenEducationPath;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.EducationInstitutionTypeRecord;
@ -121,37 +116,6 @@ public class EducationInstitutionType extends TableImpl<EducationInstitutionType
this(DSL.name("education_institution_type"), null);
}
public <O extends Record> EducationInstitutionType(Table<O> path, ForeignKey<O, EducationInstitutionTypeRecord> childPath, InverseForeignKey<O, EducationInstitutionTypeRecord> parentPath) {
super(path, childPath, parentPath, EDUCATION_INSTITUTION_TYPE);
}
/**
* A subtype implementing {@link Path} for simplified path-based joins.
*/
public static class EducationInstitutionTypePath extends EducationInstitutionType implements Path<EducationInstitutionTypeRecord> {
public <O extends Record> EducationInstitutionTypePath(Table<O> path, ForeignKey<O, EducationInstitutionTypeRecord> childPath, InverseForeignKey<O, EducationInstitutionTypeRecord> parentPath) {
super(path, childPath, parentPath);
}
private EducationInstitutionTypePath(Name alias, Table<EducationInstitutionTypeRecord> aliased) {
super(alias, aliased);
}
@Override
public EducationInstitutionTypePath as(String alias) {
return new EducationInstitutionTypePath(DSL.name(alias), this);
}
@Override
public EducationInstitutionTypePath as(Name alias) {
return new EducationInstitutionTypePath(alias, this);
}
@Override
public EducationInstitutionTypePath as(Table<?> alias) {
return new EducationInstitutionTypePath(alias.getQualifiedName(), this);
}
}
@Override
public Schema getSchema() {
return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD;
@ -172,19 +136,6 @@ public class EducationInstitutionType extends TableImpl<EducationInstitutionType
return Arrays.asList(Keys.EDUCATION_INSTITUTION_TYPE_CODE_UNIQUE_KEY);
}
private transient CitizenEducationPath _citizenEducation;
/**
* Get the implicit to-many join path to the
* <code>ervu_dashboard.citizen_education</code> table
*/
public CitizenEducationPath citizenEducation() {
if (_citizenEducation == null)
_citizenEducation = new CitizenEducationPath(this, null, Keys.CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_INSTITUTION_TYPE_CODE_FK.getInverseKey());
return _citizenEducation;
}
@Override
public EducationInstitutionType as(String alias) {
return new EducationInstitutionType(DSL.name(alias), this);

49
backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/EducationLeaveReason.java
View file

@ -10,14 +10,10 @@ import java.util.List;
import org.jooq.Condition;
import org.jooq.Field;
import org.jooq.ForeignKey;
import org.jooq.Identity;
import org.jooq.InverseForeignKey;
import org.jooq.Name;
import org.jooq.Path;
import org.jooq.PlainSQL;
import org.jooq.QueryPart;
import org.jooq.Record;
import org.jooq.SQL;
import org.jooq.Schema;
import org.jooq.Select;
@ -32,7 +28,6 @@ import org.jooq.impl.TableImpl;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.Keys;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenEducation.CitizenEducationPath;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.EducationLeaveReasonRecord;
@ -120,37 +115,6 @@ public class EducationLeaveReason extends TableImpl<EducationLeaveReasonRecord>
this(DSL.name("education_leave_reason"), null);
}
public <O extends Record> EducationLeaveReason(Table<O> path, ForeignKey<O, EducationLeaveReasonRecord> childPath, InverseForeignKey<O, EducationLeaveReasonRecord> parentPath) {
super(path, childPath, parentPath, EDUCATION_LEAVE_REASON);
}
/**
* A subtype implementing {@link Path} for simplified path-based joins.
*/
public static class EducationLeaveReasonPath extends EducationLeaveReason implements Path<EducationLeaveReasonRecord> {
public <O extends Record> EducationLeaveReasonPath(Table<O> path, ForeignKey<O, EducationLeaveReasonRecord> childPath, InverseForeignKey<O, EducationLeaveReasonRecord> parentPath) {
super(path, childPath, parentPath);
}
private EducationLeaveReasonPath(Name alias, Table<EducationLeaveReasonRecord> aliased) {
super(alias, aliased);
}
@Override
public EducationLeaveReasonPath as(String alias) {
return new EducationLeaveReasonPath(DSL.name(alias), this);
}
@Override
public EducationLeaveReasonPath as(Name alias) {
return new EducationLeaveReasonPath(alias, this);
}
@Override
public EducationLeaveReasonPath as(Table<?> alias) {
return new EducationLeaveReasonPath(alias.getQualifiedName(), this);
}
}
@Override
public Schema getSchema() {
return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD;
@ -171,19 +135,6 @@ public class EducationLeaveReason extends TableImpl<EducationLeaveReasonRecord>
return Arrays.asList(Keys.EDUCATION_LEAVE_REASON_CODE_UNIQUE_KEY);
}
private transient CitizenEducationPath _citizenEducation;
/**
* Get the implicit to-many join path to the
* <code>ervu_dashboard.citizen_education</code> table
*/
public CitizenEducationPath citizenEducation() {
if (_citizenEducation == null)
_citizenEducation = new CitizenEducationPath(this, null, Keys.CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_LEAVE_REASON_CODE_FK.getInverseKey());
return _citizenEducation;
}
@Override
public EducationLeaveReason as(String alias) {
return new EducationLeaveReason(DSL.name(alias), this);

14
backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/EducationLevel.java
View file

@ -32,7 +32,6 @@ import org.jooq.impl.TableImpl;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.Keys;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenEducation.CitizenEducationPath;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenEducationDiploma.CitizenEducationDiplomaPath;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenForeignEducationDiploma.CitizenForeignEducationDiplomaPath;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.EducationLevelRecord;
@ -170,19 +169,6 @@ public class EducationLevel extends TableImpl<EducationLevelRecord> {
return Arrays.asList(Keys.EDUCATION_LEVEL_CODE_UNIQUE_KEY);
}
private transient CitizenEducationPath _citizenEducation;
/**
* Get the implicit to-many join path to the
* <code>ervu_dashboard.citizen_education</code> table
*/
public CitizenEducationPath citizenEducation() {
if (_citizenEducation == null)
_citizenEducation = new CitizenEducationPath(this, null, Keys.CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_LEVEL_CODE_FK.getInverseKey());
return _citizenEducation;
}
private transient CitizenEducationDiplomaPath _citizenEducationDiploma;
/**

14
backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/EducationMinobrSpeciality.java
View file

@ -32,7 +32,6 @@ import org.jooq.impl.TableImpl;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.Keys;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenEducation.CitizenEducationPath;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenEducationDiploma.CitizenEducationDiplomaPath;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenForeignEducationDiploma.CitizenForeignEducationDiplomaPath;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.EducationMinobrSpecialityRecord;
@ -175,19 +174,6 @@ public class EducationMinobrSpeciality extends TableImpl<EducationMinobrSpeciali
return Arrays.asList(Keys.EDUCATION_MINOBR_SPECIALITY_CODE_UNIQUE_KEY);
}
private transient CitizenEducationPath _citizenEducation;
/**
* Get the implicit to-many join path to the
* <code>ervu_dashboard.citizen_education</code> table
*/
public CitizenEducationPath citizenEducation() {
if (_citizenEducation == null)
_citizenEducation = new CitizenEducationPath(this, null, Keys.CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_MINOBR_SPECIALITY_CODE_FK.getInverseKey());
return _citizenEducation;
}
private transient CitizenEducationDiplomaPath _citizenEducationDiploma;
/**

14
backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/EducationMinprosvSpeciality.java
View file

@ -32,7 +32,6 @@ import org.jooq.impl.TableImpl;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.Keys;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenEducation.CitizenEducationPath;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenEducationDiploma.CitizenEducationDiplomaPath;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenForeignEducationDiploma.CitizenForeignEducationDiplomaPath;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.EducationMinprosvSpecialityRecord;
@ -176,19 +175,6 @@ public class EducationMinprosvSpeciality extends TableImpl<EducationMinprosvSpec
return Arrays.asList(Keys.EDUCATION_MINPROSV_SPECIALITY_CODE_UNIQUE_KEY);
}
private transient CitizenEducationPath _citizenEducation;
/**
* Get the implicit to-many join path to the
* <code>ervu_dashboard.citizen_education</code> table
*/
public CitizenEducationPath citizenEducation() {
if (_citizenEducation == null)
_citizenEducation = new CitizenEducationPath(this, null, Keys.CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_MINPROSV_SPECIALITY_CODE_FK.getInverseKey());
return _citizenEducation;
}
private transient CitizenEducationDiplomaPath _citizenEducationDiploma;
/**

49
backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/EducationStatus.java
View file

@ -10,14 +10,10 @@ import java.util.List;
import org.jooq.Condition;
import org.jooq.Field;
import org.jooq.ForeignKey;
import org.jooq.Identity;
import org.jooq.InverseForeignKey;
import org.jooq.Name;
import org.jooq.Path;
import org.jooq.PlainSQL;
import org.jooq.QueryPart;
import org.jooq.Record;
import org.jooq.SQL;
import org.jooq.Schema;
import org.jooq.Select;
@ -32,7 +28,6 @@ import org.jooq.impl.TableImpl;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.Keys;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenEducation.CitizenEducationPath;
import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.EducationStatusRecord;
@ -117,37 +112,6 @@ public class EducationStatus extends TableImpl<EducationStatusRecord> {
this(DSL.name("education_status"), null);
}
public <O extends Record> EducationStatus(Table<O> path, ForeignKey<O, EducationStatusRecord> childPath, InverseForeignKey<O, EducationStatusRecord> parentPath) {
super(path, childPath, parentPath, EDUCATION_STATUS);
}
/**
* A subtype implementing {@link Path} for simplified path-based joins.
*/
public static class EducationStatusPath extends EducationStatus implements Path<EducationStatusRecord> {
public <O extends Record> EducationStatusPath(Table<O> path, ForeignKey<O, EducationStatusRecord> childPath, InverseForeignKey<O, EducationStatusRecord> parentPath) {
super(path, childPath, parentPath);
}
private EducationStatusPath(Name alias, Table<EducationStatusRecord> aliased) {
super(alias, aliased);
}
@Override
public EducationStatusPath as(String alias) {
return new EducationStatusPath(DSL.name(alias), this);
}
@Override
public EducationStatusPath as(Name alias) {
return new EducationStatusPath(alias, this);
}
@Override
public EducationStatusPath as(Table<?> alias) {
return new EducationStatusPath(alias.getQualifiedName(), this);
}
}
@Override
public Schema getSchema() {
return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD;
@ -168,19 +132,6 @@ public class EducationStatus extends TableImpl<EducationStatusRecord> {
return Arrays.asList(Keys.EDUCATION_STATUS_CODE_UNIQUE_KEY);
}
private transient CitizenEducationPath _citizenEducation;
/**
* Get the implicit to-many join path to the
* <code>ervu_dashboard.citizen_education</code> table
*/
public CitizenEducationPath citizenEducation() {
if (_citizenEducation == null)
_citizenEducation = new CitizenEducationPath(this, null, Keys.CITIZEN_EDUCATION__CITIZEN_EDUCATION_EDUCATION_STATUS_TYPE_CODE_FK.getInverseKey());
return _citizenEducation;
}
@Override
public EducationStatus as(String alias) {
return new EducationStatus(DSL.name(alias), this);

20
backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/Recruitment.java
View file

@ -92,6 +92,26 @@ public class Recruitment extends TableImpl<RecruitmentRecord> {
*/
public final TableField<RecruitmentRecord, Timestamp> UPDATED_AT = createField(DSL.name("updated_at"), SQLDataType.TIMESTAMP(0), this, "");
/**
* The column <code>ervu_dashboard.recruitment.created_at</code>.
*/
public final TableField<RecruitmentRecord, Timestamp> CREATED_AT = createField(DSL.name("created_at"), SQLDataType.TIMESTAMP(0), this, "");
/**
* The column <code>ervu_dashboard.recruitment.hidden</code>.
*/
public final TableField<RecruitmentRecord, Boolean> HIDDEN = createField(DSL.name("hidden"), SQLDataType.BOOLEAN, this, "");
/**
* The column <code>ervu_dashboard.recruitment.enabled</code>.
*/
public final TableField<RecruitmentRecord, Boolean> ENABLED = createField(DSL.name("enabled"), SQLDataType.BOOLEAN, this, "");
/**
* The column <code>ervu_dashboard.recruitment.reports_enabled</code>.
*/
public final TableField<RecruitmentRecord, Boolean> REPORTS_ENABLED = createField(DSL.name("reports_enabled"), SQLDataType.BOOLEAN, this, "");
private Recruitment(Name alias, Table<RecruitmentRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}

36
backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenEducationRecord.java
View file

@ -571,6 +571,38 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
return (String) get(31);
}
/**
* Setter for
* <code>ervu_dashboard.citizen_education.military_department_education_start_date</code>.
*/
public void setMilitaryDepartmentEducationStartDate(Date value) {
set(32, value);
}
/**
* Getter for
* <code>ervu_dashboard.citizen_education.military_department_education_start_date</code>.
*/
public Date getMilitaryDepartmentEducationStartDate() {
return (Date) get(32);
}
/**
* Setter for
* <code>ervu_dashboard.citizen_education.military_department_education_end_date</code>.
*/
public void setMilitaryDepartmentEducationEndDate(Date value) {
set(33, value);
}
/**
* Getter for
* <code>ervu_dashboard.citizen_education.military_department_education_end_date</code>.
*/
public Date getMilitaryDepartmentEducationEndDate() {
return (Date) get(33);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@ -594,7 +626,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
/**
* Create a detached, initialised CitizenEducationRecord
*/
public CitizenEducationRecord(Long citizenEducationId, UUID recruitId, String inn, String kpp, String ogrn, String educationalInstitutionName, String educationalInstitutionAddress, String educationalInstitutionTypeCode, String educationStatusCode, Date recoveryDate, Date recoveryOrderDate, String recoveryOrderNumber, String educationLevelCode, String gradeNumber, Date leaveStartDate, Date leaveEndDate, String leaveReasonCode, Date admissionDate, Boolean firstEducation, Boolean vusSpec, Date educationStartDate, Date plannedEducationEndDate, String educationFormCode, String minobrSpecCode, String minprosvSpecCode, Date expulsionDate, Date expulsionOrderDate, String expulsionOrderNumber, Date militaryEducationStartDate, Date militaryEducationEndDate, Date admissionOrderDate, String admissionOrderNumber) {
public CitizenEducationRecord(Long citizenEducationId, UUID recruitId, String inn, String kpp, String ogrn, String educationalInstitutionName, String educationalInstitutionAddress, String educationalInstitutionTypeCode, String educationStatusCode, Date recoveryDate, Date recoveryOrderDate, String recoveryOrderNumber, String educationLevelCode, String gradeNumber, Date leaveStartDate, Date leaveEndDate, String leaveReasonCode, Date admissionDate, Boolean firstEducation, Boolean vusSpec, Date educationStartDate, Date plannedEducationEndDate, String educationFormCode, String minobrSpecCode, String minprosvSpecCode, Date expulsionDate, Date expulsionOrderDate, String expulsionOrderNumber, Date militaryEducationStartDate, Date militaryEducationEndDate, Date admissionOrderDate, String admissionOrderNumber, Date militaryDepartmentEducationStartDate, Date militaryDepartmentEducationEndDate) {
super(CitizenEducation.CITIZEN_EDUCATION);
setCitizenEducationId(citizenEducationId);
@ -629,6 +661,8 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
setMilitaryEducationEndDate(militaryEducationEndDate);
setAdmissionOrderDate(admissionOrderDate);
setAdmissionOrderNumber(admissionOrderNumber);
setMilitaryDepartmentEducationStartDate(militaryDepartmentEducationStartDate);
setMilitaryDepartmentEducationEndDate(militaryDepartmentEducationEndDate);
resetChangedOnNotNull();
}
}

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

@ -1782,6 +1782,110 @@ public class CitizenRecord extends UpdatableRecordImpl<CitizenRecord> {
return (Boolean) get(111);
}
/**
* Setter for <code>ervu_dashboard.citizen.system_esia_id</code>.
*/
public void setSystemEsiaId(String value) {
set(112, value);
}
/**
* Getter for <code>ervu_dashboard.citizen.system_esia_id</code>.
*/
public String getSystemEsiaId() {
return (String) get(112);
}
/**
* Setter for <code>ervu_dashboard.citizen.educated</code>.
*/
public void setEducated(Boolean value) {
set(113, value);
}
/**
* Getter for <code>ervu_dashboard.citizen.educated</code>.
*/
public Boolean getEducated() {
return (Boolean) get(113);
}
/**
* Setter for <code>ervu_dashboard.citizen.has_education_diploma</code>.
*/
public void setHasEducationDiploma(Boolean value) {
set(114, value);
}
/**
* Getter for <code>ervu_dashboard.citizen.has_education_diploma</code>.
*/
public Boolean getHasEducationDiploma() {
return (Boolean) get(114);
}
/**
* Setter for
* <code>ervu_dashboard.citizen.has_foreign_education_diploma</code>.
*/
public void setHasForeignEducationDiploma(Boolean value) {
set(115, value);
}
/**
* Getter for
* <code>ervu_dashboard.citizen.has_foreign_education_diploma</code>.
*/
public Boolean getHasForeignEducationDiploma() {
return (Boolean) get(115);
}
/**
* Setter for
* <code>ervu_dashboard.citizen.has_military_department_education</code>.
*/
public void setHasMilitaryDepartmentEducation(Boolean value) {
set(116, value);
}
/**
* Getter for
* <code>ervu_dashboard.citizen.has_military_department_education</code>.
*/
public Boolean getHasMilitaryDepartmentEducation() {
return (Boolean) get(116);
}
/**
* Setter for
* <code>ervu_dashboard.citizen.has_military_training_center_education</code>.
*/
public void setHasMilitaryTrainingCenterEducation(Boolean value) {
set(117, value);
}
/**
* Getter for
* <code>ervu_dashboard.citizen.has_military_training_center_education</code>.
*/
public Boolean getHasMilitaryTrainingCenterEducation() {
return (Boolean) get(117);
}
/**
* Setter for <code>ervu_dashboard.citizen.has_actual_academic_leave</code>.
*/
public void setHasActualAcademicLeave(Boolean value) {
set(118, value);
}
/**
* Getter for <code>ervu_dashboard.citizen.has_actual_academic_leave</code>.
*/
public Boolean getHasActualAcademicLeave() {
return (Boolean) get(118);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@ -1805,7 +1909,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, Boolean hasCriminalLiabilityFz53, Boolean hasLiabilityFz53, Boolean hasAppealingViolationsFz53, Boolean hasTractorLicense, Boolean hasCriminalProsecution, Boolean hasSentence, Boolean servingSentence, Boolean hasCriminalRecord, Boolean hasSentSummons, Boolean hasServedSummons, Boolean appearedToRecruitmentCenter, Boolean notAppearedByValidExcuse, Boolean hasActiveTemporaryMeasure) {
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, Boolean hasCriminalProsecution, Boolean hasSentence, Boolean servingSentence, Boolean hasCriminalRecord, Boolean hasSentSummons, Boolean hasServedSummons, Boolean appearedToRecruitmentCenter, Boolean notAppearedByValidExcuse, Boolean hasActiveTemporaryMeasure, String systemEsiaId, Boolean educated, Boolean hasEducationDiploma, Boolean hasForeignEducationDiploma, Boolean hasMilitaryDepartmentEducation, Boolean hasMilitaryTrainingCenterEducation, Boolean hasActualAcademicLeave) {
super(Citizen.CITIZEN);
setResidence(residence);
@ -1920,6 +2024,13 @@ public class CitizenRecord extends UpdatableRecordImpl<CitizenRecord> {
setAppearedToRecruitmentCenter(appearedToRecruitmentCenter);
setNotAppearedByValidExcuse(notAppearedByValidExcuse);
setHasActiveTemporaryMeasure(hasActiveTemporaryMeasure);
setSystemEsiaId(systemEsiaId);
setEducated(educated);
setHasEducationDiploma(hasEducationDiploma);
setHasForeignEducationDiploma(hasForeignEducationDiploma);
setHasMilitaryDepartmentEducation(hasMilitaryDepartmentEducation);
setHasMilitaryTrainingCenterEducation(hasMilitaryTrainingCenterEducation);
setHasActualAcademicLeave(hasActualAcademicLeave);
resetChangedOnNotNull();
}
}

62
backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/RecruitmentRecord.java
View file

@ -133,6 +133,62 @@ public class RecruitmentRecord extends UpdatableRecordImpl<RecruitmentRecord> {
return (Timestamp) get(7);
}
/**
* Setter for <code>ervu_dashboard.recruitment.created_at</code>.
*/
public void setCreatedAt(Timestamp value) {
set(8, value);
}
/**
* Getter for <code>ervu_dashboard.recruitment.created_at</code>.
*/
public Timestamp getCreatedAt() {
return (Timestamp) get(8);
}
/**
* Setter for <code>ervu_dashboard.recruitment.hidden</code>.
*/
public void setHidden(Boolean value) {
set(9, value);
}
/**
* Getter for <code>ervu_dashboard.recruitment.hidden</code>.
*/
public Boolean getHidden() {
return (Boolean) get(9);
}
/**
* Setter for <code>ervu_dashboard.recruitment.enabled</code>.
*/
public void setEnabled(Boolean value) {
set(10, value);
}
/**
* Getter for <code>ervu_dashboard.recruitment.enabled</code>.
*/
public Boolean getEnabled() {
return (Boolean) get(10);
}
/**
* Setter for <code>ervu_dashboard.recruitment.reports_enabled</code>.
*/
public void setReportsEnabled(Boolean value) {
set(11, value);
}
/**
* Getter for <code>ervu_dashboard.recruitment.reports_enabled</code>.
*/
public Boolean getReportsEnabled() {
return (Boolean) get(11);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@ -156,7 +212,7 @@ public class RecruitmentRecord extends UpdatableRecordImpl<RecruitmentRecord> {
/**
* Create a detached, initialised RecruitmentRecord
*/
public RecruitmentRecord(UUID id, String shortname, UUID idmId, String code, UUID parentId, Long sort, String schema, Timestamp updatedAt) {
public RecruitmentRecord(UUID id, String shortname, UUID idmId, String code, UUID parentId, Long sort, String schema, Timestamp updatedAt, Timestamp createdAt, Boolean hidden, Boolean enabled, Boolean reportsEnabled) {
super(Recruitment.RECRUITMENT);
setId(id);
@ -167,6 +223,10 @@ public class RecruitmentRecord extends UpdatableRecordImpl<RecruitmentRecord> {
setSort(sort);
setSchema(schema);
setUpdatedAt(updatedAt);
setCreatedAt(createdAt);
setHidden(hidden);
setEnabled(enabled);
setReportsEnabled(reportsEnabled);
resetChangedOnNotNull();
}
}

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

File diff suppressed because it is too large Load diff