fix

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

@@ -8,7 +8,6 @@ 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;
@@ -71,11 +70,6 @@ public class CitizenEducation extends TableImpl<CitizenEducationRecord> {
      */
     public final TableField<CitizenEducationRecord, Long> CITIZEN_EDUCATION_ID = createField(DSL.name("citizen_education_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
 
-    /**
-     * The column <code>ervu_dashboard.citizen_education.recruit_id</code>.
-     */
-    public final TableField<CitizenEducationRecord, UUID> RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "");
-
     /**
      * The column <code>ervu_dashboard.citizen_education.inn</code>. ИНН
      */

backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/CitizenEducationDiploma.java

@@ -8,7 +8,6 @@ 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;
@@ -157,13 +156,6 @@ public class CitizenEducationDiploma extends TableImpl<CitizenEducationDiplomaRe
      */
     public final TableField<CitizenEducationDiplomaRecord, String> EDUCATION_SPECIALITY_MINPROSV_CODE = createField(DSL.name("education_speciality_minprosv_code"), SQLDataType.VARCHAR, this, "Код вида документа минобразования");
 
-    /**
-     * The column
-     * <code>ervu_dashboard.citizen_education_diploma.recruit_id</code>.
-     * Идентификатор рекрута
-     */
-    public final TableField<CitizenEducationDiplomaRecord, UUID> RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "Идентификатор рекрута");
-
     private CitizenEducationDiploma(Name alias, Table<CitizenEducationDiplomaRecord> aliased) {
         this(alias, aliased, (Field<?>[]) null, null);
     }

backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/CitizenForeignEducationDiploma.java

@@ -8,7 +8,6 @@ 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;
@@ -173,13 +172,6 @@ public class CitizenForeignEducationDiploma extends TableImpl<CitizenForeignEduc
      */
     public final TableField<CitizenForeignEducationDiplomaRecord, String> EDUCATION_SPECIALITY_MINPROSV_CODE = createField(DSL.name("education_speciality_minprosv_code"), SQLDataType.VARCHAR, this, "Код вида документа минобразования");
 
-    /**
-     * The column
-     * <code>ervu_dashboard.citizen_foreign_education_diploma.recruit_id</code>.
-     * Идентификатор рекрута
-     */
-    public final TableField<CitizenForeignEducationDiplomaRecord, UUID> RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "Идентификатор рекрута");
-
     private CitizenForeignEducationDiploma(Name alias, Table<CitizenForeignEducationDiplomaRecord> aliased) {
         this(alias, aliased, (Field<?>[]) null, null);
     }

backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenEducationDiplomaRecord.java

@@ -5,7 +5,6 @@ package ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records;
 
 
 import java.sql.Date;
-import java.util.UUID;
 
 import org.jooq.Record1;
 import org.jooq.impl.UpdatableRecordImpl;
@@ -259,24 +258,6 @@ public class CitizenEducationDiplomaRecord extends UpdatableRecordImpl<CitizenEd
         return (String) get(12);
     }
 
-    /**
-     * Setter for
-     * <code>ervu_dashboard.citizen_education_diploma.recruit_id</code>.
-     * Идентификатор рекрута
-     */
-    public void setRecruitId(UUID value) {
-        set(13, value);
-    }
-
-    /**
-     * Getter for
-     * <code>ervu_dashboard.citizen_education_diploma.recruit_id</code>.
-     * Идентификатор рекрута
-     */
-    public UUID getRecruitId() {
-        return (UUID) get(13);
-    }
-
     // -------------------------------------------------------------------------
     // Primary key information
     // -------------------------------------------------------------------------
@@ -300,7 +281,7 @@ public class CitizenEducationDiplomaRecord extends UpdatableRecordImpl<CitizenEd
     /**
      * Create a detached, initialised CitizenEducationDiplomaRecord
      */
-    public CitizenEducationDiplomaRecord(Long citizenEducationDiplomaId, String educationSpecialityCode, Date issueDate, String educationInstitutionName, String educationLevelCode, String regNumber, Boolean vusSpec, String blankNumber, String blankSeries, String docTypeCodeMinobr, String docTypeCodeMinprosv, String educationSpecialityMinpobrCode, String educationSpecialityMinprosvCode, UUID recruitId) {
+    public CitizenEducationDiplomaRecord(Long citizenEducationDiplomaId, String educationSpecialityCode, Date issueDate, String educationInstitutionName, String educationLevelCode, String regNumber, Boolean vusSpec, String blankNumber, String blankSeries, String docTypeCodeMinobr, String docTypeCodeMinprosv, String educationSpecialityMinpobrCode, String educationSpecialityMinprosvCode) {
         super(CitizenEducationDiploma.CITIZEN_EDUCATION_DIPLOMA);
 
         setCitizenEducationDiplomaId(citizenEducationDiplomaId);
@@ -316,7 +297,6 @@ public class CitizenEducationDiplomaRecord extends UpdatableRecordImpl<CitizenEd
         setDocTypeCodeMinprosv(docTypeCodeMinprosv);
         setEducationSpecialityMinpobrCode(educationSpecialityMinpobrCode);
         setEducationSpecialityMinprosvCode(educationSpecialityMinprosvCode);
-        setRecruitId(recruitId);
         resetChangedOnNotNull();
     }
 }

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

@@ -5,7 +5,6 @@ package ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records;
 
 
 import java.sql.Date;
-import java.util.UUID;
 
 import org.jooq.Record1;
 import org.jooq.impl.UpdatableRecordImpl;
@@ -37,60 +36,46 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
         return (Long) get(0);
     }
 
-    /**
-     * Setter for <code>ervu_dashboard.citizen_education.recruit_id</code>.
-     */
-    public void setRecruitId(UUID value) {
-        set(1, value);
-    }
-
-    /**
-     * Getter for <code>ervu_dashboard.citizen_education.recruit_id</code>.
-     */
-    public UUID getRecruitId() {
-        return (UUID) get(1);
-    }
-
     /**
      * Setter for <code>ervu_dashboard.citizen_education.inn</code>. ИНН
      */
     public void setInn(String value) {
-        set(2, value);
+        set(1, value);
     }
 
     /**
      * Getter for <code>ervu_dashboard.citizen_education.inn</code>. ИНН
      */
     public String getInn() {
-        return (String) get(2);
+        return (String) get(1);
     }
 
     /**
      * Setter for <code>ervu_dashboard.citizen_education.kpp</code>. КПП
      */
     public void setKpp(String value) {
-        set(3, value);
+        set(2, value);
     }
 
     /**
      * Getter for <code>ervu_dashboard.citizen_education.kpp</code>. КПП
      */
     public String getKpp() {
-        return (String) get(3);
+        return (String) get(2);
     }
 
     /**
      * Setter for <code>ervu_dashboard.citizen_education.ogrn</code>. ОГРН
      */
     public void setOgrn(String value) {
-        set(4, value);
+        set(3, value);
     }
 
     /**
      * Getter for <code>ervu_dashboard.citizen_education.ogrn</code>. ОГРН
      */
     public String getOgrn() {
-        return (String) get(4);
+        return (String) get(3);
     }
 
     /**
@@ -99,7 +84,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Наименование образовательного учреждения
      */
     public void setEducationalInstitutionName(String value) {
-        set(5, value);
+        set(4, value);
     }
 
     /**
@@ -108,7 +93,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Наименование образовательного учреждения
      */
     public String getEducationalInstitutionName() {
-        return (String) get(5);
+        return (String) get(4);
     }
 
     /**
@@ -117,7 +102,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Адрес образовательного учреждения
      */
     public void setEducationalInstitutionAddress(String value) {
-        set(6, value);
+        set(5, value);
     }
 
     /**
@@ -126,7 +111,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Адрес образовательного учреждения
      */
     public String getEducationalInstitutionAddress() {
-        return (String) get(6);
+        return (String) get(5);
     }
 
     /**
@@ -135,7 +120,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Код типа образовательного учреждения
      */
     public void setEducationalInstitutionTypeCode(String value) {
-        set(7, value);
+        set(6, value);
     }
 
     /**
@@ -144,7 +129,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Код типа образовательного учреждения
      */
     public String getEducationalInstitutionTypeCode() {
-        return (String) get(7);
+        return (String) get(6);
     }
 
     /**
@@ -153,7 +138,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * статуса обучения
      */
     public void setEducationStatusCode(String value) {
-        set(8, value);
+        set(7, value);
     }
 
     /**
@@ -162,7 +147,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * статуса обучения
      */
     public String getEducationStatusCode() {
-        return (String) get(8);
+        return (String) get(7);
     }
 
     /**
@@ -170,7 +155,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Дата восстановления
      */
     public void setRecoveryDate(Date value) {
-        set(9, value);
+        set(8, value);
     }
 
     /**
@@ -178,7 +163,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Дата восстановления
      */
     public Date getRecoveryDate() {
-        return (Date) get(9);
+        return (Date) get(8);
     }
 
     /**
@@ -187,7 +172,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * приказа на восстановление
      */
     public void setRecoveryOrderDate(Date value) {
-        set(10, value);
+        set(9, value);
     }
 
     /**
@@ -196,7 +181,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * приказа на восстановление
      */
     public Date getRecoveryOrderDate() {
-        return (Date) get(10);
+        return (Date) get(9);
     }
 
     /**
@@ -205,7 +190,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Номер приказа на восстановление
      */
     public void setRecoveryOrderNumber(String value) {
-        set(11, value);
+        set(10, value);
     }
 
     /**
@@ -214,7 +199,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Номер приказа на восстановление
      */
     public String getRecoveryOrderNumber() {
-        return (String) get(11);
+        return (String) get(10);
     }
 
     /**
@@ -223,7 +208,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * уровня образования
      */
     public void setEducationLevelCode(String value) {
-        set(12, value);
+        set(11, value);
     }
 
     /**
@@ -232,7 +217,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * уровня образования
      */
     public String getEducationLevelCode() {
-        return (String) get(12);
+        return (String) get(11);
     }
 
     /**
@@ -240,7 +225,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Номер класса/курса
      */
     public void setGradeNumber(String value) {
-        set(13, value);
+        set(12, value);
     }
 
     /**
@@ -248,7 +233,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Номер класса/курса
      */
     public String getGradeNumber() {
-        return (String) get(13);
+        return (String) get(12);
     }
 
     /**
@@ -257,7 +242,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * начала отпуска
      */
     public void setLeaveStartDate(Date value) {
-        set(14, value);
+        set(13, value);
     }
 
     /**
@@ -266,7 +251,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * начала отпуска
      */
     public Date getLeaveStartDate() {
-        return (Date) get(14);
+        return (Date) get(13);
     }
 
     /**
@@ -274,7 +259,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Дата окончания отпуска
      */
     public void setLeaveEndDate(Date value) {
-        set(15, value);
+        set(14, value);
     }
 
     /**
@@ -282,7 +267,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Дата окончания отпуска
      */
     public Date getLeaveEndDate() {
-        return (Date) get(15);
+        return (Date) get(14);
     }
 
     /**
@@ -291,7 +276,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * причины отпуска
      */
     public void setLeaveReasonCode(String value) {
-        set(16, value);
+        set(15, value);
     }
 
     /**
@@ -300,7 +285,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * причины отпуска
      */
     public String getLeaveReasonCode() {
-        return (String) get(16);
+        return (String) get(15);
     }
 
     /**
@@ -308,7 +293,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Дата зачисления
      */
     public void setAdmissionDate(Date value) {
-        set(17, value);
+        set(16, value);
     }
 
     /**
@@ -316,7 +301,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Дата зачисления
      */
     public Date getAdmissionDate() {
-        return (Date) get(17);
+        return (Date) get(16);
     }
 
     /**
@@ -324,7 +309,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Признак получения образования впервые
      */
     public void setFirstEducation(Boolean value) {
-        set(18, value);
+        set(17, value);
     }
 
     /**
@@ -332,7 +317,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Признак получения образования впервые
      */
     public Boolean getFirstEducation() {
-        return (Boolean) get(18);
+        return (Boolean) get(17);
     }
 
     /**
@@ -343,7 +328,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * специальности и подлежат постановке на воинский учет
      */
     public void setVusSpec(Boolean value) {
-        set(19, value);
+        set(18, value);
     }
 
     /**
@@ -354,7 +339,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * специальности и подлежат постановке на воинский учет
      */
     public Boolean getVusSpec() {
-        return (Boolean) get(19);
+        return (Boolean) get(18);
     }
 
     /**
@@ -363,7 +348,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * начала обучения
      */
     public void setEducationStartDate(Date value) {
-        set(20, value);
+        set(19, value);
     }
 
     /**
@@ -372,7 +357,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * начала обучения
      */
     public Date getEducationStartDate() {
-        return (Date) get(20);
+        return (Date) get(19);
     }
 
     /**
@@ -381,7 +366,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Планируемая дата окончания обучения
      */
     public void setPlannedEducationEndDate(Date value) {
-        set(21, value);
+        set(20, value);
     }
 
     /**
@@ -390,7 +375,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Планируемая дата окончания обучения
      */
     public Date getPlannedEducationEndDate() {
-        return (Date) get(21);
+        return (Date) get(20);
     }
 
     /**
@@ -399,7 +384,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * формы обучения
      */
     public void setEducationFormCode(String value) {
-        set(22, value);
+        set(21, value);
     }
 
     /**
@@ -408,7 +393,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * формы обучения
      */
     public String getEducationFormCode() {
-        return (String) get(22);
+        return (String) get(21);
     }
 
     /**
@@ -417,7 +402,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * специальности минобразования
      */
     public void setMinobrSpecCode(String value) {
-        set(23, value);
+        set(22, value);
     }
 
     /**
@@ -426,7 +411,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * специальности минобразования
      */
     public String getMinobrSpecCode() {
-        return (String) get(23);
+        return (String) get(22);
     }
 
     /**
@@ -435,7 +420,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * специальности минпросвещения
      */
     public void setMinprosvSpecCode(String value) {
-        set(24, value);
+        set(23, value);
     }
 
     /**
@@ -444,7 +429,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * специальности минпросвещения
      */
     public String getMinprosvSpecCode() {
-        return (String) get(24);
+        return (String) get(23);
     }
 
     /**
@@ -452,7 +437,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Дата отчисления
      */
     public void setExpulsionDate(Date value) {
-        set(25, value);
+        set(24, value);
     }
 
     /**
@@ -460,7 +445,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Дата отчисления
      */
     public Date getExpulsionDate() {
-        return (Date) get(25);
+        return (Date) get(24);
     }
 
     /**
@@ -469,7 +454,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * приказа на отчисление
      */
     public void setExpulsionOrderDate(Date value) {
-        set(26, value);
+        set(25, value);
     }
 
     /**
@@ -478,7 +463,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * приказа на отчисление
      */
     public Date getExpulsionOrderDate() {
-        return (Date) get(26);
+        return (Date) get(25);
     }
 
     /**
@@ -487,7 +472,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Номер приказа на отчисление
      */
     public void setExpulsionOrderNumber(String value) {
-        set(27, value);
+        set(26, value);
     }
 
     /**
@@ -496,7 +481,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Номер приказа на отчисление
      */
     public String getExpulsionOrderNumber() {
-        return (String) get(27);
+        return (String) get(26);
     }
 
     /**
@@ -505,7 +490,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Дата начала обучения в военно-учебном центре
      */
     public void setMilitaryEducationStartDate(Date value) {
-        set(28, value);
+        set(27, value);
     }
 
     /**
@@ -514,7 +499,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Дата начала обучения в военно-учебном центре
      */
     public Date getMilitaryEducationStartDate() {
-        return (Date) get(28);
+        return (Date) get(27);
     }
 
     /**
@@ -523,7 +508,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Дата окончания обучения в военно-учебном центре
      */
     public void setMilitaryEducationEndDate(Date value) {
-        set(29, value);
+        set(28, value);
     }
 
     /**
@@ -532,7 +517,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Дата окончания обучения в военно-учебном центре
      */
     public Date getMilitaryEducationEndDate() {
-        return (Date) get(29);
+        return (Date) get(28);
     }
 
     /**
@@ -541,7 +526,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * приказа о зачислении
      */
     public void setAdmissionOrderDate(Date value) {
-        set(30, value);
+        set(29, value);
     }
 
     /**
@@ -550,7 +535,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * приказа о зачислении
      */
     public Date getAdmissionOrderDate() {
-        return (Date) get(30);
+        return (Date) get(29);
     }
 
     /**
@@ -559,7 +544,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Номер приказа о зачислении
      */
     public void setAdmissionOrderNumber(String value) {
-        set(31, value);
+        set(30, value);
     }
 
     /**
@@ -568,7 +553,7 @@ public class CitizenEducationRecord extends UpdatableRecordImpl<CitizenEducation
      * Номер приказа о зачислении
      */
     public String getAdmissionOrderNumber() {
-        return (String) get(31);
+        return (String) get(30);
     }
 
     // -------------------------------------------------------------------------
@@ -594,11 +579,10 @@ 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, 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) {
         super(CitizenEducation.CITIZEN_EDUCATION);
 
         setCitizenEducationId(citizenEducationId);
-        setRecruitId(recruitId);
         setInn(inn);
         setKpp(kpp);
         setOgrn(ogrn);

backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenForeignEducationDiplomaRecord.java

@@ -5,7 +5,6 @@ package ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records;
 
 
 import java.sql.Date;
-import java.util.UUID;
 
 import org.jooq.Record1;
 import org.jooq.impl.UpdatableRecordImpl;
@@ -301,24 +300,6 @@ public class CitizenForeignEducationDiplomaRecord extends UpdatableRecordImpl<Ci
         return (String) get(14);
     }
 
-    /**
-     * Setter for
-     * <code>ervu_dashboard.citizen_foreign_education_diploma.recruit_id</code>.
-     * Идентификатор рекрута
-     */
-    public void setRecruitId(UUID value) {
-        set(15, value);
-    }
-
-    /**
-     * Getter for
-     * <code>ervu_dashboard.citizen_foreign_education_diploma.recruit_id</code>.
-     * Идентификатор рекрута
-     */
-    public UUID getRecruitId() {
-        return (UUID) get(15);
-    }
-
     // -------------------------------------------------------------------------
     // Primary key information
     // -------------------------------------------------------------------------
@@ -342,7 +323,7 @@ public class CitizenForeignEducationDiplomaRecord extends UpdatableRecordImpl<Ci
     /**
      * Create a detached, initialised CitizenForeignEducationDiplomaRecord
      */
-    public CitizenForeignEducationDiplomaRecord(Long citizenForeignEducationDiplomaId, String educationSpecialityCode, String qualification, String oksmCode, String studyField, String educationCertificateNumber, Date recognitionDate, String educationLevelCode, Boolean vusSpec, String docRegNum, String docRegSeries, String foreignDocName, String educationInstitutionName, String educationSpecialityMinpobrCode, String educationSpecialityMinprosvCode, UUID recruitId) {
+    public CitizenForeignEducationDiplomaRecord(Long citizenForeignEducationDiplomaId, String educationSpecialityCode, String qualification, String oksmCode, String studyField, String educationCertificateNumber, Date recognitionDate, String educationLevelCode, Boolean vusSpec, String docRegNum, String docRegSeries, String foreignDocName, String educationInstitutionName, String educationSpecialityMinpobrCode, String educationSpecialityMinprosvCode) {
         super(CitizenForeignEducationDiploma.CITIZEN_FOREIGN_EDUCATION_DIPLOMA);
 
         setCitizenForeignEducationDiplomaId(citizenForeignEducationDiplomaId);
@@ -360,7 +341,6 @@ public class CitizenForeignEducationDiplomaRecord extends UpdatableRecordImpl<Ci
         setEducationInstitutionName(educationInstitutionName);
         setEducationSpecialityMinpobrCode(educationSpecialityMinpobrCode);
         setEducationSpecialityMinprosvCode(educationSpecialityMinprosvCode);
-        setRecruitId(recruitId);
         resetChangedOnNotNull();
     }
 }

resources/src/main/resources/business-model/citizen_all_filters.page

@@ -20635,6 +20635,13 @@
         <removed>true</removed>
     </children>
 </children>
+<children id="52c26d4f-cd41-4695-86e1-9418e647b483">
+    <prototypeId>3a00a919-c6aa-4fbf-951e-b6f2dbc24764</prototypeId>
+    <componentRootId>52c26d4f-cd41-4695-86e1-9418e647b483</componentRootId>
+    <name>Список (фильтр)</name>
+    <container>false</container>
+    <removed>true</removed>
+</children>
 <children id="d2647818-c837-4074-8bf8-9c0ab8c92244">
     <prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
     <componentRootId>d2647818-c837-4074-8bf8-9c0ab8c92244</componentRootId>
@@ -20668,6 +20675,7 @@
     <componentRootId>98f17219-c586-48f9-bb15-398e7351425d</componentRootId>
     <name>Tab item_Сведения об отсрочке или освобождении от призыва</name>
     <container>true</container>
+    <expanded>false</expanded>
     <childrenReordered>false</childrenReordered>
     <scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
         <properties>
@@ -20689,6 +20697,13 @@
     <scripts id="98b064c8-1d68-432b-a99b-f8868d987e43"/>
     <scripts id="0f6c4754-b38d-4ecf-b9b6-556168286ae6"/>
     <scripts id="540780ae-3c57-4c6b-86d3-22e52cefd63f"/>
+    <children id="52c26d4f-cd41-4695-86e1-9418e647b483">
+        <prototypeId>3a00a919-c6aa-4fbf-951e-b6f2dbc24764</prototypeId>
+        <componentRootId>52c26d4f-cd41-4695-86e1-9418e647b483</componentRootId>
+        <name>Список (фильтр)</name>
+        <container>false</container>
+        <removed>true</removed>
+    </children>
     <children id="db08a754-28fb-4302-9e3c-6cc1d947cef5">
         <prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
         <componentRootId>db08a754-28fb-4302-9e3c-6cc1d947cef5</componentRootId>
@@ -21370,6 +21385,7 @@
             <componentRootId>1245eafe-305a-4521-a4df-3f4e701cac70</componentRootId>
             <name>Hbox</name>
             <container>true</container>
+            <expanded>false</expanded>
             <childrenReordered>false</childrenReordered>
             <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
             <scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
@@ -28782,6 +28798,241 @@
                 <enabled>false</enabled>
             </scripts>
         </children>
+        <children id="c4b1bdb7-f224-4bdd-a4fb-d694fc3edf8f">
+            <prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
+            <componentRootId>c4b1bdb7-f224-4bdd-a4fb-d694fc3edf8f</componentRootId>
+            <name>Text Статус обучающегося</name>
+            <container>false</container>
+            <childrenReordered>false</childrenReordered>
+            <scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
+                <properties>
+                    <entry>
+                        <key>cssClasses</key>
+                        <value>
+                            <item id="476a2afc-7bd4-4dbe-8516-b0a04c4fa666" removed="true"/>
+                            <item id="60444939-9513-4fef-ad71-a443e8d21a52" removed="true"/>
+                            <item id="d7ef5d39-4a30-453c-b249-c1a6c485b00d" removed="true"/>
+                        </value>
+                    </entry>
+                    <entry>
+                        <key>initialValue</key>
+                        <value>
+                            <simple>"Статус обучающегося"</simple>
+                        </value>
+                    </entry>
+                </properties>
+            </scripts>
+            <scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
+            <scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
+            <scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
+            <scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
+                <enabled>false</enabled>
+            </scripts>
+        </children>
+        <children id="52c26d4f-cd41-4695-86e1-9418e647b483">
+            <prototypeId>3a00a919-c6aa-4fbf-951e-b6f2dbc24764</prototypeId>
+            <componentRootId>52c26d4f-cd41-4695-86e1-9418e647b483</componentRootId>
+            <name>Статус обучающегося (фильтр)</name>
+            <container>false</container>
+            <childrenReordered>false</childrenReordered>
+            <scripts id="848c80a8-d213-48d0-be5c-c7da93c48620"/>
+            <scripts id="59ec7992-f088-4dbf-8bfe-3b38d9a89408">
+                <properties>
+                    <entry>
+                        <key>operation</key>
+                        <value>
+                            <simple>"EQUAL"</simple>
+                        </value>
+                    </entry>
+                </properties>
+            </scripts>
+            <scripts id="efb0fec7-9951-4b36-bbda-fa17aa002d74">
+                <properties>
+                    <entry>
+                        <key>comboBoxService</key>
+                        <value>
+                            <complex>
+<entry>
+    <key>businessIdColumn</key>
+    <value>
+        <simple>{"schema":"ervu_dashboard","table":"education_status","entity":"education_status","name":"code"}</simple>
+    </value>
+</entry>
+<entry>
+    <key>displayColumn</key>
+    <value>
+        <simple>{"schema":"ervu_dashboard","table":"education_status","entity":"education_status","name":"value"}</simple>
+    </value>
+</entry>
+<entry>
+    <key>loadDao</key>
+    <value>
+        <complex>
+            <entry>
+                <key>graph</key>
+                <value>
+                    <simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"education_status","schemaName":"ervu_dashboard","x":405.0,"y":231.0,"alias":"education_status","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"education_status","schemaName":"ervu_dashboard","x":405.0,"y":231.0,"alias":"education_status","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"education_status":{"tableName":"education_status","schemaName":"ervu_dashboard","x":405.0,"y":231.0,"alias":"education_status","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
+                </value>
+            </entry>
+        </complex>
+    </value>
+</entry>
+                            </complex>
+                        </value>
+                    </entry>
+                </properties>
+            </scripts>
+            <scripts id="b17eca3b-9ec5-4462-9d6f-30bd53f91d12">
+                <properties>
+                    <entry>
+                        <key>columnForFilter</key>
+                        <value>
+                            <simple>{"schema":"ervu_dashboard","table":"citizen_deferment_right","entity":"citizen_deferment_right","name":"code"}</simple>
+                        </value>
+                    </entry>
+                </properties>
+            </scripts>
+            <scripts id="4d028ea6-e4a3-4acf-bd60-de7aa1a78f71"/>
+            <scripts id="9f543b36-92e3-4a63-b8db-a4d7e852113e">
+                <enabled>false</enabled>
+                <properties>
+                    <entry>
+                        <key>loadType</key>
+                        <value>
+                            <simple>null</simple>
+                        </value>
+                    </entry>
+                </properties>
+            </scripts>
+            <scripts id="47f307b6-79a7-4c9a-96d6-6ee423565f02">
+                <enabled>false</enabled>
+            </scripts>
+        </children>
+        <children id="85f2fec8-746c-4727-8e4f-d1962094d06d">
+            <prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
+            <componentRootId>85f2fec8-746c-4727-8e4f-d1962094d06d</componentRootId>
+            <name>Text Причины отпуска</name>
+            <container>false</container>
+            <childrenReordered>false</childrenReordered>
+            <scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
+                <properties>
+                    <entry>
+                        <key>cssClasses</key>
+                        <value>
+                            <item id="476a2afc-7bd4-4dbe-8516-b0a04c4fa666" removed="true"/>
+                            <item id="60444939-9513-4fef-ad71-a443e8d21a52" removed="true"/>
+                            <item id="d7ef5d39-4a30-453c-b249-c1a6c485b00d" removed="true"/>
+                        </value>
+                    </entry>
+                    <entry>
+                        <key>disabled</key>
+                        <value>
+                            <simple>true</simple>
+                        </value>
+                    </entry>
+                    <entry>
+                        <key>initialValue</key>
+                        <value>
+                            <simple>"Причины отпуска"</simple>
+                        </value>
+                    </entry>
+                </properties>
+            </scripts>
+            <scripts id="737b67e2-295f-4356-a1e1-9419344d8c85"/>
+            <scripts id="a6ccccd9-354c-4725-9d34-c716cf626048"/>
+            <scripts id="d38c1af5-2bfe-41cd-ab0f-67040f498127"/>
+            <scripts id="f203f156-be32-4131-9c86-4d6bac6d5d56">
+                <enabled>false</enabled>
+            </scripts>
+        </children>
+        <children id="35c23ced-0587-43df-b60c-5f5fb01bd366">
+            <prototypeId>3a00a919-c6aa-4fbf-951e-b6f2dbc24764</prototypeId>
+            <componentRootId>35c23ced-0587-43df-b60c-5f5fb01bd366</componentRootId>
+            <name>Причины отпуска (фильтр)</name>
+            <container>false</container>
+            <childrenReordered>false</childrenReordered>
+            <scripts id="848c80a8-d213-48d0-be5c-c7da93c48620">
+                <properties>
+                    <entry>
+                        <key>disabled</key>
+                        <value>
+                            <simple>true</simple>
+                        </value>
+                    </entry>
+                </properties>
+            </scripts>
+            <scripts id="59ec7992-f088-4dbf-8bfe-3b38d9a89408">
+                <properties>
+                    <entry>
+                        <key>operation</key>
+                        <value>
+                            <simple>"EQUAL"</simple>
+                        </value>
+                    </entry>
+                </properties>
+            </scripts>
+            <scripts id="efb0fec7-9951-4b36-bbda-fa17aa002d74">
+                <properties>
+                    <entry>
+                        <key>comboBoxService</key>
+                        <value>
+                            <complex>
+<entry>
+    <key>businessIdColumn</key>
+    <value>
+        <simple>{"schema":"ervu_dashboard","table":"education_leave_reason","entity":"education_leave_reason","name":"code"}</simple>
+    </value>
+</entry>
+<entry>
+    <key>displayColumn</key>
+    <value>
+        <simple>{"schema":"ervu_dashboard","table":"education_leave_reason","entity":"education_leave_reason","name":"value"}</simple>
+    </value>
+</entry>
+<entry>
+    <key>loadDao</key>
+    <value>
+        <complex>
+            <entry>
+                <key>graph</key>
+                <value>
+                    <simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"education_leave_reason","schemaName":"ervu_dashboard","x":361.0,"y":206.0,"alias":"education_leave_reason","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"education_leave_reason","schemaName":"ervu_dashboard","x":361.0,"y":206.0,"alias":"education_leave_reason","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"education_leave_reason":{"tableName":"education_leave_reason","schemaName":"ervu_dashboard","x":361.0,"y":206.0,"alias":"education_leave_reason","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
+                </value>
+            </entry>
+        </complex>
+    </value>
+</entry>
+                            </complex>
+                        </value>
+                    </entry>
+                </properties>
+            </scripts>
+            <scripts id="b17eca3b-9ec5-4462-9d6f-30bd53f91d12">
+                <properties>
+                    <entry>
+                        <key>columnForFilter</key>
+                        <value>
+                            <simple>{"schema":"ervu_dashboard","table":"citizen_deferment_right","entity":"citizen_deferment_right","name":"code"}</simple>
+                        </value>
+                    </entry>
+                </properties>
+            </scripts>
+            <scripts id="4d028ea6-e4a3-4acf-bd60-de7aa1a78f71"/>
+            <scripts id="9f543b36-92e3-4a63-b8db-a4d7e852113e">
+                <enabled>false</enabled>
+                <properties>
+                    <entry>
+                        <key>loadType</key>
+                        <value>
+                            <simple>null</simple>
+                        </value>
+                    </entry>
+                </properties>
+            </scripts>
+            <scripts id="47f307b6-79a7-4c9a-96d6-6ee423565f02">
+                <enabled>false</enabled>
+            </scripts>
+        </children>
         <children id="15e67a8f-3e27-4d13-bfee-dee6f51f8d27">
             <prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
             <componentRootId>15e67a8f-3e27-4d13-bfee-dee6f51f8d27</componentRootId>
@@ -30251,6 +30502,7 @@
             <componentRootId>853c701b-667b-46a8-a532-918ed08522cc</componentRootId>
             <name>Горизонтальный контейнер</name>
             <container>true</container>
+            <expanded>false</expanded>
             <childrenReordered>false</childrenReordered>
             <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
             <scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
@@ -31716,6 +31968,7 @@
             <componentRootId>3a21193e-b64b-4219-a41d-54ad14f8e1df</componentRootId>
             <name>Горизонтальный контейнер</name>
             <container>true</container>
+            <expanded>false</expanded>
             <childrenReordered>false</childrenReordered>
             <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
             <scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
@@ -33647,6 +33900,13 @@
                 </properties>
             </scripts>
         </children>
+        <children id="d58f0587-8d99-4c5f-b8cd-539af2f86ec2">
+            <prototypeId>ba24d307-0b91-4299-ba82-9d0b52384ff2</prototypeId>
+            <componentRootId>d58f0587-8d99-4c5f-b8cd-539af2f86ec2</componentRootId>
+            <name>Text Образовательная организация</name>
+            <container>false</container>
+            <removed>true</removed>
+        </children>
     </children>
 </children>
 <children id="28066d5a-5be0-4cfc-a260-74b71bdc5437">
@@ -40803,7 +41063,6 @@
     <componentRootId>c272a88f-ea80-4c44-bed1-d496734fbb09</componentRootId>
     <name>Tab item_Сведения о присвоении спортивных разрядов и званий</name>
     <container>true</container>
-    <expanded>false</expanded>
     <childrenReordered>false</childrenReordered>
     <scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
         <properties>

resources/src/main/resources/business-model/citizencard.page

@@ -645,6 +645,7 @@
                     <componentRootId>67120d9a-602f-44a1-9ede-88a2e797a295</componentRootId>
                     <name>Вертикальный контейнер - сведения о гражданине</name>
                     <container>true</container>
+                    <expanded>false</expanded>
                     <childrenReordered>false</childrenReordered>
                     <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
                         <properties>
@@ -4612,6 +4613,7 @@
                             <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>
@@ -17183,7 +17185,6 @@
                             <componentRootId>cb814ffd-638b-4901-9d9f-ec3f5838d159</componentRootId>
                             <name>Сведения о состоянии зоровья, о присвоении спортивных разрядов и званий</name>
                             <container>true</container>
-                            <expanded>false</expanded>
                             <childrenReordered>false</childrenReordered>
                             <scripts id="d1ce20ca-453b-4610-a2a5-bb6498db5cf5">
 <properties>