diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java index a8aee5b1..56c6c6b6 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java @@ -65,6 +65,7 @@ import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Property; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Prosecution; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.PubRecruitment; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Punishment; +import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.ReasonDict; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.RecruitErvuStatus; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Recruitment; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Subpoena; @@ -349,6 +350,11 @@ public class ErvuDashboard extends SchemaImpl { */ public final Punishment PUNISHMENT = Punishment.PUNISHMENT; + /** + * The table ervu_dashboard.reason_dict. + */ + public final ReasonDict REASON_DICT = ReasonDict.REASON_DICT; + /** * Справочник статусов ЕРВУ */ @@ -458,6 +464,7 @@ public class ErvuDashboard extends SchemaImpl { Prosecution.PROSECUTION, PubRecruitment.PUB_RECRUITMENT, Punishment.PUNISHMENT, + ReasonDict.REASON_DICT, RecruitErvuStatus.RECRUIT_ERVU_STATUS, Recruitment.RECRUITMENT, Subpoena.SUBPOENA, diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/Keys.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/Keys.java index 4671321a..37cf6743 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/Keys.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/Keys.java @@ -61,6 +61,7 @@ import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Property; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Prosecution; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.PubRecruitment; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Punishment; +import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.ReasonDict; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.RecruitErvuStatus; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Recruitment; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Subpoena; @@ -118,6 +119,7 @@ import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.PropertyR import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.ProsecutionRecord; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.PubRecruitmentRecord; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.PunishmentRecord; +import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.ReasonDictRecord; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.RecruitErvuStatusRecord; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.RecruitmentRecord; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records.SubpoenaRecord; @@ -200,6 +202,7 @@ public class Keys { public static final UniqueKey PUB_RECRUITMENT_PKEY = Internal.createUniqueKey(PubRecruitment.PUB_RECRUITMENT, DSL.name("pub_recruitment_pkey"), new TableField[] { PubRecruitment.PUB_RECRUITMENT.ID }, true); public static final UniqueKey RECRUITMENT_IDM_ID_KEY = Internal.createUniqueKey(PubRecruitment.PUB_RECRUITMENT, DSL.name("recruitment_idm_id_key"), new TableField[] { PubRecruitment.PUB_RECRUITMENT.IDM_ID }, true); public static final UniqueKey PK_PUNISHMENT = Internal.createUniqueKey(Punishment.PUNISHMENT, DSL.name("pk_punishment"), new TableField[] { Punishment.PUNISHMENT.PUNISHMENT_ID }, true); + public static final UniqueKey REASON_DICT_PKEY = Internal.createUniqueKey(ReasonDict.REASON_DICT, DSL.name("reason_dict_pkey"), new TableField[] { ReasonDict.REASON_DICT.CODE }, true); public static final UniqueKey RECRUIT_ERVU_STATUS_CODE_UNIQUE_KEY = Internal.createUniqueKey(RecruitErvuStatus.RECRUIT_ERVU_STATUS, DSL.name("recruit_ervu_status_code_unique_key"), new TableField[] { RecruitErvuStatus.RECRUIT_ERVU_STATUS.CODE }, true); public static final UniqueKey RECRUIT_ERVU_STATUS_PKEY = Internal.createUniqueKey(RecruitErvuStatus.RECRUIT_ERVU_STATUS, DSL.name("recruit_ervu_status_pkey"), new TableField[] { RecruitErvuStatus.RECRUIT_ERVU_STATUS.RECRUIT_ERVU_STATUS_ID }, true); public static final UniqueKey RECRUITMENT_PKEY = Internal.createUniqueKey(Recruitment.RECRUITMENT, DSL.name("recruitment_pkey"), new TableField[] { Recruitment.RECRUITMENT.IDM_ID }, true); diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/Tables.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/Tables.java index e44a7f54..a20689fd 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/Tables.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/Tables.java @@ -56,6 +56,7 @@ import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Property; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Prosecution; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.PubRecruitment; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Punishment; +import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.ReasonDict; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.RecruitErvuStatus; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Recruitment; import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.Subpoena; @@ -333,6 +334,11 @@ public class Tables { */ public static final Punishment PUNISHMENT = Punishment.PUNISHMENT; + /** + * The table ervu_dashboard.reason_dict. + */ + public static final ReasonDict REASON_DICT = ReasonDict.REASON_DICT; + /** * Справочник статусов ЕРВУ */ diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizen.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizen.java index 290048cf..6baab661 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizen.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizen.java @@ -120,7 +120,7 @@ public class Citizen extends TableImpl { * The column ervu_dashboard.citizen.reason_registration. * Причина постановки на учёт */ - public final TableField REASON_REGISTRATION = createField(DSL.name("reason_registration"), SQLDataType.VARCHAR, this, "Причина постановки на учёт"); + public final TableField REASON_REGISTRATION = createField(DSL.name("reason_registration"), SQLDataType.INTEGER, this, "Причина постановки на учёт"); /** * The column ervu_dashboard.citizen.driver_license. diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/ReasonDict.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/ReasonDict.java new file mode 100644 index 00000000..5ae3a740 --- /dev/null +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/ReasonDict.java @@ -0,0 +1,229 @@ +/* + * This file is generated by jOOQ. + */ +package ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables; + + +import java.sql.Timestamp; +import java.util.Collection; + +import org.jooq.Condition; +import org.jooq.Field; +import org.jooq.Name; +import org.jooq.PlainSQL; +import org.jooq.QueryPart; +import org.jooq.SQL; +import org.jooq.Schema; +import org.jooq.Select; +import org.jooq.Stringly; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.TableOptions; +import org.jooq.UniqueKey; +import org.jooq.impl.DSL; +import org.jooq.impl.SQLDataType; +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.records.ReasonDictRecord; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class ReasonDict extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of ervu_dashboard.reason_dict + */ + public static final ReasonDict REASON_DICT = new ReasonDict(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return ReasonDictRecord.class; + } + + /** + * The column ervu_dashboard.reason_dict.code. + */ + public final TableField CODE = createField(DSL.name("code"), SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column ervu_dashboard.reason_dict.description. + */ + public final TableField DESCRIPTION = createField(DSL.name("description"), SQLDataType.VARCHAR(255).nullable(false), this, ""); + + /** + * The column ervu_dashboard.reason_dict.created_at. + */ + public final TableField CREATED_AT = createField(DSL.name("created_at"), SQLDataType.TIMESTAMP(0).defaultValue(DSL.field(DSL.raw("CURRENT_TIMESTAMP"), SQLDataType.TIMESTAMP)), this, ""); + + private ReasonDict(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private ReasonDict(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where); + } + + /** + * Create an aliased ervu_dashboard.reason_dict table reference + */ + public ReasonDict(String alias) { + this(DSL.name(alias), REASON_DICT); + } + + /** + * Create an aliased ervu_dashboard.reason_dict table reference + */ + public ReasonDict(Name alias) { + this(alias, REASON_DICT); + } + + /** + * Create a ervu_dashboard.reason_dict table reference + */ + public ReasonDict() { + this(DSL.name("reason_dict"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD; + } + + @Override + public UniqueKey getPrimaryKey() { + return Keys.REASON_DICT_PKEY; + } + + @Override + public ReasonDict as(String alias) { + return new ReasonDict(DSL.name(alias), this); + } + + @Override + public ReasonDict as(Name alias) { + return new ReasonDict(alias, this); + } + + @Override + public ReasonDict as(Table alias) { + return new ReasonDict(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public ReasonDict rename(String name) { + return new ReasonDict(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public ReasonDict rename(Name name) { + return new ReasonDict(name, null); + } + + /** + * Rename this table + */ + @Override + public ReasonDict rename(Table name) { + return new ReasonDict(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ReasonDict where(Condition condition) { + return new ReasonDict(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ReasonDict where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ReasonDict where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ReasonDict where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public ReasonDict where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public ReasonDict where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public ReasonDict where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public ReasonDict where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ReasonDict whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ReasonDict whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/Subpoena.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/Subpoena.java index 9ccfdde5..2b41890b 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/Subpoena.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/Subpoena.java @@ -246,6 +246,11 @@ public class Subpoena extends TableImpl { */ public final TableField STATUS_CHANGE_DATE = createField(DSL.name("status_change_date"), SQLDataType.TIMESTAMP(0), this, ""); + /** + * The column ervu_dashboard.subpoena.active_status. + */ + public final TableField ACTIVE_STATUS = createField(DSL.name("active_status"), SQLDataType.BOOLEAN, this, ""); + private Subpoena(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); } diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenRecord.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenRecord.java index 76d40cac..0c109fb4 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenRecord.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenRecord.java @@ -196,7 +196,7 @@ public class CitizenRecord extends UpdatableRecordImpl { * Setter for ervu_dashboard.citizen.reason_registration. * Причина постановки на учёт */ - public void setReasonRegistration(String value) { + public void setReasonRegistration(Integer value) { set(11, value); } @@ -204,8 +204,8 @@ public class CitizenRecord extends UpdatableRecordImpl { * Getter for ervu_dashboard.citizen.reason_registration. * Причина постановки на учёт */ - public String getReasonRegistration() { - return (String) get(11); + public Integer getReasonRegistration() { + return (Integer) get(11); } /** @@ -1909,7 +1909,7 @@ public class CitizenRecord extends UpdatableRecordImpl { /** * 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, String systemEsiaId, Boolean educated, Boolean hasEducationDiploma, Boolean hasForeignEducationDiploma, Boolean hasMilitaryDepartmentEducation, Boolean hasMilitaryTrainingCenterEducation, Boolean hasActualAcademicLeave) { + public CitizenRecord(String residence, String isRegistered, String passportSeries, String passportNumber, String phone, String medicalRequirements, String defermentLiberation, String gender, String maritalStatus, String education, String employment, Integer 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); diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/ReasonDictRecord.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/ReasonDictRecord.java new file mode 100644 index 00000000..d05e6b65 --- /dev/null +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/ReasonDictRecord.java @@ -0,0 +1,96 @@ +/* + * This file is generated by jOOQ. + */ +package ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.records; + + +import java.sql.Timestamp; + +import org.jooq.Record1; +import org.jooq.impl.UpdatableRecordImpl; + +import ru.micord.ervu_dashboard.db_beans.ervu_dashboard.tables.ReasonDict; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class ReasonDictRecord extends UpdatableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for ervu_dashboard.reason_dict.code. + */ + public void setCode(Integer value) { + set(0, value); + } + + /** + * Getter for ervu_dashboard.reason_dict.code. + */ + public Integer getCode() { + return (Integer) get(0); + } + + /** + * Setter for ervu_dashboard.reason_dict.description. + */ + public void setDescription(String value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.reason_dict.description. + */ + public String getDescription() { + return (String) get(1); + } + + /** + * Setter for ervu_dashboard.reason_dict.created_at. + */ + public void setCreatedAt(Timestamp value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.reason_dict.created_at. + */ + public Timestamp getCreatedAt() { + return (Timestamp) get(2); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 key() { + return (Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached ReasonDictRecord + */ + public ReasonDictRecord() { + super(ReasonDict.REASON_DICT); + } + + /** + * Create a detached, initialised ReasonDictRecord + */ + public ReasonDictRecord(Integer code, String description, Timestamp createdAt) { + super(ReasonDict.REASON_DICT); + + setCode(code); + setDescription(description); + setCreatedAt(createdAt); + resetChangedOnNotNull(); + } +} diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/SubpoenaRecord.java b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/SubpoenaRecord.java index e9911b12..54a962d3 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/SubpoenaRecord.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/db_beans/ervu_dashboard/tables/records/SubpoenaRecord.java @@ -540,6 +540,20 @@ public class SubpoenaRecord extends UpdatableRecordImpl { return (Timestamp) get(32); } + /** + * Setter for ervu_dashboard.subpoena.active_status. + */ + public void setActiveStatus(Boolean value) { + set(33, value); + } + + /** + * Getter for ervu_dashboard.subpoena.active_status. + */ + public Boolean getActiveStatus() { + return (Boolean) get(33); + } + // ------------------------------------------------------------------------- // Primary key information // ------------------------------------------------------------------------- @@ -563,7 +577,7 @@ public class SubpoenaRecord extends UpdatableRecordImpl { /** * Create a detached, initialised SubpoenaRecord */ - public SubpoenaRecord(Long subId, String series, String number, Timestamp createDate, Timestamp visitDate, Timestamp sendDate, String reasonCancelled, UUID recruitId, UUID departmentId, String subpoenaStatus, String subpoenaReason, String fioCommiss, String trackNumber, String recruitmentName, String address, String methodSending, UUID subpoenaId, String sigInfo, String deliveryFio, String actNumber, String methodDelivery, Timestamp deliveryDate, String deliveryStatus, String appearance, String appearanceStatus, Time datePublicRegister, Time visitDateTrue, Time dateRecognitionReason, Boolean signSendingInfoGoodReason, Time dateSendingGoodReason, String infoNotVisitRecognitionGoodReason, String subpoenaDirectedFact, Timestamp statusChangeDate) { + public SubpoenaRecord(Long subId, String series, String number, Timestamp createDate, Timestamp visitDate, Timestamp sendDate, String reasonCancelled, UUID recruitId, UUID departmentId, String subpoenaStatus, String subpoenaReason, String fioCommiss, String trackNumber, String recruitmentName, String address, String methodSending, UUID subpoenaId, String sigInfo, String deliveryFio, String actNumber, String methodDelivery, Timestamp deliveryDate, String deliveryStatus, String appearance, String appearanceStatus, Time datePublicRegister, Time visitDateTrue, Time dateRecognitionReason, Boolean signSendingInfoGoodReason, Time dateSendingGoodReason, String infoNotVisitRecognitionGoodReason, String subpoenaDirectedFact, Timestamp statusChangeDate, Boolean activeStatus) { super(Subpoena.SUBPOENA); setSubId(subId); @@ -599,6 +613,7 @@ public class SubpoenaRecord extends UpdatableRecordImpl { setInfoNotVisitRecognitionGoodReason(infoNotVisitRecognitionGoodReason); setSubpoenaDirectedFact(subpoenaDirectedFact); setStatusChangeDate(statusChangeDate); + setActiveStatus(activeStatus); resetChangedOnNotNull(); } } diff --git a/resources/src/main/resources/business-model/citizencard.page b/resources/src/main/resources/business-model/citizencard.page index ee1adb3e..28006b40 100644 --- a/resources/src/main/resources/business-model/citizencard.page +++ b/resources/src/main/resources/business-model/citizencard.page @@ -6860,6 +6860,7 @@ bb092270-2cdc-4aaa-bce8-74622a15341f Сведения о воинском учете true + false false @@ -9727,7 +9728,6 @@ f82d177a-9c72-4854-a670-a9140444a02a Повестки и временные меры true - false false @@ -9957,7 +9957,6 @@ f2ef47df-9cae-4441-ba1d-0c4902c78548 Таблица - повестки true -false false @@ -10347,7 +10346,7 @@ valueFormatter - DateTimeFormatter + UserZoneDateTimeFormatter component.grid.formatters