From 20907f3e7c895f7c586fb88b77c968cb4f4aea2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=83=D0=BB=D0=B0=D1=82=20=D0=A5=D0=B0=D0=B9=D1=80?= =?UTF-8?q?=D1=83=D0=BB=D0=BB=D0=B8=D0=BD?= Date: Fri, 4 Oct 2024 21:46:29 +0300 Subject: [PATCH] db beans --- .../ervu_dashboard/ErvuDashboard.java | 9 +- .../db_beans/ervu_dashboard/Keys.java | 5 +- .../db_beans/ervu_dashboard/Tables.java | 8 +- .../ervu_dashboard/tables/Citizen.java | 2 +- .../ervu_dashboard/tables/Decision.java | 240 ++++++++++++++ .../ervu_dashboard/tables/Recruitment.java | 3 +- .../ervu_dashboard/tables/Subpoena.java | 133 ++++++-- .../tables/TemporaryMeasures.java | 73 ++++- .../tables/records/CitizenRecord.java | 8 +- .../tables/records/DecisionRecord.java | 111 +++++++ .../tables/records/RecruitmentRecord.java | 10 +- .../tables/records/SubpoenaRecord.java | 294 ++++++++++++++++-- .../records/TemporaryMeasuresRecord.java | 247 +++++++++++---- 13 files changed, 1013 insertions(+), 130 deletions(-) create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Decision.java create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/DecisionRecord.java diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java index 03e659b7..3590f2d5 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java @@ -13,6 +13,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Citizenship; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenshipForeign; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangelog; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangeloglock; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Decision; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Deputy; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disability; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disease; @@ -89,6 +90,11 @@ public class ErvuDashboard extends SchemaImpl { */ public final Databasechangeloglock DATABASECHANGELOGLOCK = Databasechangeloglock.DATABASECHANGELOGLOCK; + /** + * The table ervu_dashboard.decision. + */ + public final Decision DECISION = Decision.DECISION; + /** * сведения о гражданах, избранных депутатами/зарегистрированных кандидатами * на участие в выборах @@ -146,7 +152,7 @@ public class ErvuDashboard extends SchemaImpl { public final Recruitment RECRUITMENT = Recruitment.RECRUITMENT; /** - * The table ervu_dashboard.subpoena. + * сведения о направлении повестки военного комиссариата */ public final Subpoena SUBPOENA = Subpoena.SUBPOENA; @@ -184,6 +190,7 @@ public class ErvuDashboard extends SchemaImpl { CitizenshipForeign.CITIZENSHIP_FOREIGN, Databasechangelog.DATABASECHANGELOG, Databasechangeloglock.DATABASECHANGELOGLOCK, + Decision.DECISION, Deputy.DEPUTY, Disability.DISABILITY, Disease.DISEASE, diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java index 3287f830..b2010943 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java @@ -11,6 +11,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenSpous import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Citizenship; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenshipForeign; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangeloglock; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Decision; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Deputy; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disability; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disease; @@ -32,6 +33,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.Citi import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenshipForeignRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenshipRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DatabasechangeloglockRecord; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DecisionRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DeputyRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DisabilityRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DiseaseRecord; @@ -71,6 +73,7 @@ public class Keys { public static final UniqueKey PK_CITIZENSHIP = Internal.createUniqueKey(Citizenship.CITIZENSHIP, DSL.name("pk_citizenship"), new TableField[] { Citizenship.CITIZENSHIP.CITIZENSHIP_ID }, true); public static final UniqueKey PK_CITIZENSHIP_FOREIGN = Internal.createUniqueKey(CitizenshipForeign.CITIZENSHIP_FOREIGN, DSL.name("pk_citizenship_foreign"), new TableField[] { CitizenshipForeign.CITIZENSHIP_FOREIGN.CITIZENSHIP_FOREIGN_ID }, true); public static final UniqueKey DATABASECHANGELOGLOCK_PKEY = Internal.createUniqueKey(Databasechangeloglock.DATABASECHANGELOGLOCK, DSL.name("databasechangeloglock_pkey"), new TableField[] { Databasechangeloglock.DATABASECHANGELOGLOCK.ID }, true); + public static final UniqueKey DECISION_PKEY = Internal.createUniqueKey(Decision.DECISION, DSL.name("decision_pkey"), new TableField[] { Decision.DECISION.DECISION_ID }, true); public static final UniqueKey PK_DEPUTY = Internal.createUniqueKey(Deputy.DEPUTY, DSL.name("pk_deputy"), new TableField[] { Deputy.DEPUTY.DEPUTY_ID }, true); public static final UniqueKey PK_DISABILITY = Internal.createUniqueKey(Disability.DISABILITY, DSL.name("pk_disability"), new TableField[] { Disability.DISABILITY.DISABILITY_ID }, true); public static final UniqueKey PK_DISEASE = Internal.createUniqueKey(Disease.DISEASE, DSL.name("pk_disease"), new TableField[] { Disease.DISEASE.DISEASE_ID }, true); @@ -83,7 +86,7 @@ public class Keys { 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 RECRUITMENT_PKEY = Internal.createUniqueKey(Recruitment.RECRUITMENT, DSL.name("recruitment_pkey"), new TableField[] { Recruitment.RECRUITMENT.ID }, true); - public static final UniqueKey SUBPOENA_PKEY = Internal.createUniqueKey(Subpoena.SUBPOENA, DSL.name("subpoena_pkey"), new TableField[] { Subpoena.SUBPOENA.SUBPOENA_ID }, true); + public static final UniqueKey SUBPOENA_PKEY = Internal.createUniqueKey(Subpoena.SUBPOENA, DSL.name("subpoena_pkey"), new TableField[] { Subpoena.SUBPOENA.SUB_ID }, true); public static final UniqueKey TEMPORARY_MEASURES_PKEY = Internal.createUniqueKey(TemporaryMeasures.TEMPORARY_MEASURES, DSL.name("temporary_measures_pkey"), new TableField[] { TemporaryMeasures.TEMPORARY_MEASURES.TEMPORARY_MEASURES_ID }, true); public static final UniqueKey PK_WORK = Internal.createUniqueKey(Work.WORK, DSL.name("pk_work"), new TableField[] { Work.WORK.WORK_ID }, true); } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java index bfc83539..5472f66c 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java @@ -12,6 +12,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Citizenship; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenshipForeign; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangelog; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangeloglock; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Decision; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Deputy; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disability; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disease; @@ -74,6 +75,11 @@ public class Tables { */ public static final Databasechangeloglock DATABASECHANGELOGLOCK = Databasechangeloglock.DATABASECHANGELOGLOCK; + /** + * The table ervu_dashboard.decision. + */ + public static final Decision DECISION = Decision.DECISION; + /** * сведения о гражданах, избранных депутатами/зарегистрированных кандидатами * на участие в выборах @@ -131,7 +137,7 @@ public class Tables { public static final Recruitment RECRUITMENT = Recruitment.RECRUITMENT; /** - * The table ervu_dashboard.subpoena. + * сведения о направлении повестки военного комиссариата */ public static final Subpoena SUBPOENA = Subpoena.SUBPOENA; diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizen.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizen.java index 9d6cb5f5..c757b5ef 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizen.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizen.java @@ -265,7 +265,7 @@ public class Citizen extends TableImpl { /** * The column ervu_dashboard.citizen.recruitment_id. */ - public final TableField RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.CHAR(36), this, ""); + public final TableField RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.UUID, this, ""); /** * The column ervu_dashboard.citizen.issue_date. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Decision.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Decision.java new file mode 100644 index 00000000..5887fdd5 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Decision.java @@ -0,0 +1,240 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables; + + +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DecisionRecord; + +import java.util.Collection; +import java.util.UUID; + +import org.jooq.Condition; +import org.jooq.Field; +import org.jooq.Identity; +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; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class Decision extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of ervu_dashboard.decision + */ + public static final Decision DECISION = new Decision(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return DecisionRecord.class; + } + + /** + * The column ervu_dashboard.decision.decision_id. + */ + public final TableField DECISION_ID = createField(DSL.name("decision_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + /** + * The column ervu_dashboard.decision.subpoena_id. + */ + public final TableField SUBPOENA_ID = createField(DSL.name("subpoena_id"), SQLDataType.UUID, this, ""); + + /** + * The column ervu_dashboard.decision.recruit_id. + */ + public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID, this, ""); + + /** + * The column ervu_dashboard.decision.recruitment_id. + */ + public final TableField RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.UUID, this, ""); + + private Decision(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private Decision(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where); + } + + /** + * Create an aliased ervu_dashboard.decision table reference + */ + public Decision(String alias) { + this(DSL.name(alias), DECISION); + } + + /** + * Create an aliased ervu_dashboard.decision table reference + */ + public Decision(Name alias) { + this(alias, DECISION); + } + + /** + * Create a ervu_dashboard.decision table reference + */ + public Decision() { + this(DSL.name("decision"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD; + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public UniqueKey getPrimaryKey() { + return Keys.DECISION_PKEY; + } + + @Override + public Decision as(String alias) { + return new Decision(DSL.name(alias), this); + } + + @Override + public Decision as(Name alias) { + return new Decision(alias, this); + } + + @Override + public Decision as(Table alias) { + return new Decision(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public Decision rename(String name) { + return new Decision(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public Decision rename(Name name) { + return new Decision(name, null); + } + + /** + * Rename this table + */ + @Override + public Decision rename(Table name) { + return new Decision(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Decision where(Condition condition) { + return new Decision(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Decision where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Decision where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Decision where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Decision where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Decision where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Decision where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Decision where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Decision whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Decision whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Recruitment.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Recruitment.java index b87f5409..daf2477c 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Recruitment.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Recruitment.java @@ -12,6 +12,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ratings.tables.ConscriptionInfo.Co import ervu_dashboard.ervu_dashboard.db_beans.recruitment_campaign.tables.PostponementInfo.PostponementInfoPath; import java.util.Collection; +import java.util.UUID; import org.jooq.Condition; import org.jooq.Field; @@ -70,7 +71,7 @@ public class Recruitment extends TableImpl { /** * The column ervu_dashboard.recruitment.idm_id. */ - public final TableField IDM_ID = createField(DSL.name("idm_id"), SQLDataType.VARCHAR(36), this, ""); + public final TableField IDM_ID = createField(DSL.name("idm_id"), SQLDataType.UUID, this, ""); /** * The column ervu_dashboard.recruitment.code. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Subpoena.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Subpoena.java index 55c9acf3..31870fa8 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Subpoena.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Subpoena.java @@ -32,7 +32,7 @@ import org.jooq.impl.TableImpl; /** - * This class is generated by jOOQ. + * сведения о направлении повестки военного комиссариата */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Subpoena extends TableImpl { @@ -53,66 +53,153 @@ public class Subpoena extends TableImpl { } /** - * The column ervu_dashboard.subpoena.subpoena_id. + * The column ervu_dashboard.subpoena.sub_id. */ - public final TableField SUBPOENA_ID = createField(DSL.name("subpoena_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + public final TableField SUB_ID = createField(DSL.name("sub_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); /** - * The column ervu_dashboard.subpoena.series. + * The column ervu_dashboard.subpoena.series. серия повестки */ - public final TableField SERIES = createField(DSL.name("series"), SQLDataType.VARCHAR(16), this, ""); + public final TableField SERIES = createField(DSL.name("series"), SQLDataType.VARCHAR(16), this, "серия повестки"); /** - * The column ervu_dashboard.subpoena.number. + * The column ervu_dashboard.subpoena.number. номер повестки */ - public final TableField NUMBER = createField(DSL.name("number"), SQLDataType.VARCHAR(36).nullable(false), this, ""); + public final TableField NUMBER = createField(DSL.name("number"), SQLDataType.VARCHAR(36).nullable(false), this, "номер повестки"); /** - * The column ervu_dashboard.subpoena.create_date. + * The column ervu_dashboard.subpoena.create_date. дата + * создания записи */ - public final TableField CREATE_DATE = createField(DSL.name("create_date"), SQLDataType.TIMESTAMP(0).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.TIMESTAMP)), this, ""); + public final TableField CREATE_DATE = createField(DSL.name("create_date"), SQLDataType.TIMESTAMP(0).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.TIMESTAMP)), this, "дата создания записи"); /** - * The column ervu_dashboard.subpoena.visit_date. + * The column ervu_dashboard.subpoena.visit_date. время и дата + * явки в ВК */ - public final TableField VISIT_DATE = createField(DSL.name("visit_date"), SQLDataType.TIMESTAMP(0), this, ""); + public final TableField VISIT_DATE = createField(DSL.name("visit_date"), SQLDataType.TIMESTAMP(0), this, "время и дата явки в ВК"); /** - * The column ervu_dashboard.subpoena.send_date. + * The column ervu_dashboard.subpoena.send_date. дата + * направления повестки */ - public final TableField SEND_DATE = createField(DSL.name("send_date"), SQLDataType.TIMESTAMP(0), this, ""); + public final TableField SEND_DATE = createField(DSL.name("send_date"), SQLDataType.TIMESTAMP(0), this, "дата направления повестки"); /** - * The column ervu_dashboard.subpoena.reason_cancelled. + * The column ervu_dashboard.subpoena.reason_cancelled. причина + * отклонения повестки */ - public final TableField REASON_CANCELLED = createField(DSL.name("reason_cancelled"), SQLDataType.VARCHAR(255), this, ""); + public final TableField REASON_CANCELLED = createField(DSL.name("reason_cancelled"), SQLDataType.VARCHAR(255), this, "причина отклонения повестки"); /** - * The column ervu_dashboard.subpoena.recruit_id. + * The column ervu_dashboard.subpoena.recruit_id. идентификатор + * рекрута */ - public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID, this, ""); + public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID, this, "идентификатор рекрута"); /** * The column ervu_dashboard.subpoena.department_id. + * идентификатор ВК */ - public final TableField DEPARTMENT_ID = createField(DSL.name("department_id"), SQLDataType.UUID, this, ""); + public final TableField DEPARTMENT_ID = createField(DSL.name("department_id"), SQLDataType.UUID, this, "идентификатор ВК"); /** - * The column ervu_dashboard.subpoena.subpoena_status. + * The column ervu_dashboard.subpoena.subpoena_status. статус + * повестки */ - public final TableField SUBPOENA_STATUS = createField(DSL.name("subpoena_status"), SQLDataType.CLOB, this, ""); + public final TableField SUBPOENA_STATUS = createField(DSL.name("subpoena_status"), SQLDataType.CLOB, this, "статус повестки"); /** - * The column ervu_dashboard.subpoena.subpoena_reason. + * The column ervu_dashboard.subpoena.subpoena_reason. причина + * вызова по повестке */ - public final TableField SUBPOENA_REASON = createField(DSL.name("subpoena_reason"), SQLDataType.CLOB, this, ""); + public final TableField SUBPOENA_REASON = createField(DSL.name("subpoena_reason"), SQLDataType.CLOB, this, "причина вызова по повестке"); + + /** + * The column ervu_dashboard.subpoena.fio_commiss. фио + * комиссара + */ + public final TableField FIO_COMMISS = createField(DSL.name("fio_commiss"), SQLDataType.CLOB, this, "фио комиссара"); + + /** + * The column ervu_dashboard.subpoena.track_number. уникальный + * номер заказного почтового отправления, которым направлена повестка + */ + public final TableField TRACK_NUMBER = createField(DSL.name("track_number"), SQLDataType.CLOB, this, "уникальный номер заказного почтового отправления, которым направлена повестка"); + + /** + * The column ervu_dashboard.subpoena.recruitment_name. + * наименование ВК, направившего повестку + */ + public final TableField RECRUITMENT_NAME = createField(DSL.name("recruitment_name"), SQLDataType.CLOB, this, "наименование ВК, направившего повестку"); + + /** + * The column ervu_dashboard.subpoena.address. адрес, по + * которому нужно явиться по повестке + */ + public final TableField ADDRESS = createField(DSL.name("address"), SQLDataType.CLOB, this, "адрес, по которому нужно явиться по повестке"); + + /** + * The column ervu_dashboard.subpoena.method_sending. способ + * направления повестки + */ + public final TableField METHOD_SENDING = createField(DSL.name("method_sending"), SQLDataType.CLOB, this, "способ направления повестки"); + + /** + * The column ervu_dashboard.subpoena.subpoena_id. + * идентификатор повестки + */ + public final TableField SUBPOENA_ID = createField(DSL.name("subpoena_id"), SQLDataType.UUID, this, "идентификатор повестки"); + + /** + * The column ervu_dashboard.subpoena.sig_info. открепленная ЭП + */ + public final TableField SIG_INFO = createField(DSL.name("sig_info"), SQLDataType.VARCHAR(255), this, "открепленная ЭП"); + + /** + * The column ervu_dashboard.subpoena.delivery_fio. фио лица, + * оповестившего гражданина о последствиях отказа от получения повестки + */ + public final TableField DELIVERY_FIO = createField(DSL.name("delivery_fio"), SQLDataType.CLOB, this, "фио лица, оповестившего гражданина о последствиях отказа от получения повестки"); + + /** + * The column ervu_dashboard.subpoena.act_number. номер акта об + * отказе от получения повестки + */ + public final TableField ACT_NUMBER = createField(DSL.name("act_number"), SQLDataType.CLOB, this, "номер акта об отказе от получения повестки"); + + /** + * The column ervu_dashboard.subpoena.method_delivery. способ + * вручения + */ + public final TableField METHOD_DELIVERY = createField(DSL.name("method_delivery"), SQLDataType.CLOB, this, "способ вручения"); + + /** + * The column ervu_dashboard.subpoena.delivery_date. + */ + public final TableField DELIVERY_DATE = createField(DSL.name("delivery_date"), SQLDataType.TIMESTAMP(0), this, ""); + + /** + * The column ervu_dashboard.subpoena.delivery_status. + */ + public final TableField DELIVERY_STATUS = createField(DSL.name("delivery_status"), SQLDataType.CLOB, this, ""); + + /** + * The column ervu_dashboard.subpoena.appearance. + */ + public final TableField APPEARANCE = createField(DSL.name("appearance"), SQLDataType.CLOB, this, ""); + + /** + * The column ervu_dashboard.subpoena.appearance_status. + */ + public final TableField APPEARANCE_STATUS = createField(DSL.name("appearance_status"), SQLDataType.CLOB, this, ""); private Subpoena(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); } private Subpoena(Name alias, Table aliased, Field[] parameters, Condition where) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where); + super(alias, null, aliased, parameters, DSL.comment("сведения о направлении повестки военного комиссариата"), TableOptions.table(), where); } /** diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/TemporaryMeasures.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/TemporaryMeasures.java index 4c6e2ba0..a2d50051 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/TemporaryMeasures.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/TemporaryMeasures.java @@ -8,7 +8,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.TemporaryMeasuresRecord; -import java.sql.Date; +import java.sql.Timestamp; import java.util.Collection; import java.util.UUID; @@ -58,37 +58,86 @@ public class TemporaryMeasures extends TableImpl { */ public final TableField TEMPORARY_MEASURES_ID = createField(DSL.name("temporary_measures_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + /** + * The column ervu_dashboard.temporary_measures.subpoena_id. + */ + public final TableField SUBPOENA_ID = createField(DSL.name("subpoena_id"), SQLDataType.UUID, this, ""); + + /** + * The column ervu_dashboard.temporary_measures.recruit_id. + */ + public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID, this, ""); + /** * The column ervu_dashboard.temporary_measures.recruitment_id. */ - public final TableField RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.VARCHAR.nullable(false), this, ""); + public final TableField RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.UUID, this, ""); /** - * The column ervu_dashboard.temporary_measures.name. + * The column ervu_dashboard.temporary_measures.status_measure. + * статус временной меры */ - public final TableField NAME = createField(DSL.name("name"), SQLDataType.VARCHAR.nullable(false), this, ""); + public final TableField STATUS_MEASURE = createField(DSL.name("status_measure"), SQLDataType.CLOB, this, "статус временной меры"); /** * The column - * ervu_dashboard.temporary_measures.date_application. + * ervu_dashboard.temporary_measures.recruitment_name. + * наименование ВК */ - public final TableField DATE_APPLICATION = createField(DSL.name("date_application"), SQLDataType.DATE.nullable(false), this, ""); + public final TableField RECRUITMENT_NAME = createField(DSL.name("recruitment_name"), SQLDataType.CLOB, this, "наименование ВК"); + + /** + * The column ervu_dashboard.temporary_measures.cancel_date. + * дата, с которой отменена временная мера + */ + public final TableField CANCEL_DATE = createField(DSL.name("cancel_date"), SQLDataType.TIMESTAMP(0), this, "дата, с которой отменена временная мера"); /** * The column - * ervu_dashboard.temporary_measures.withdrawal_date. + * ervu_dashboard.temporary_measures.restriction_name. + * наименование временной меры */ - public final TableField WITHDRAWAL_DATE = createField(DSL.name("withdrawal_date"), SQLDataType.DATE, this, ""); + public final TableField RESTRICTION_NAME = createField(DSL.name("restriction_name"), SQLDataType.CLOB, this, "наименование временной меры"); /** - * The column ervu_dashboard.temporary_measures.status. + * The column ervu_dashboard.temporary_measures.type. тип + * документа ограничения */ - public final TableField STATUS = createField(DSL.name("status"), SQLDataType.CHAR(100), this, ""); + public final TableField TYPE = createField(DSL.name("type"), SQLDataType.CLOB, this, "тип документа ограничения"); /** - * The column ervu_dashboard.temporary_measures.citizen_id. + * The column + * ervu_dashboard.temporary_measures.decision_number_create. + * номер решения о применении временной меры */ - public final TableField CITIZEN_ID = createField(DSL.name("citizen_id"), SQLDataType.UUID, this, ""); + public final TableField DECISION_NUMBER_CREATE = createField(DSL.name("decision_number_create"), SQLDataType.CLOB, this, "номер решения о применении временной меры"); + + /** + * The column + * ervu_dashboard.temporary_measures.decision_number_cancel. + * номер решения об отмене временной меры + */ + public final TableField DECISION_NUMBER_CANCEL = createField(DSL.name("decision_number_cancel"), SQLDataType.CLOB, this, "номер решения об отмене временной меры"); + + /** + * The column + * ervu_dashboard.temporary_measures.decision_date_create. дата + * решения о применении временной меры + */ + public final TableField DECISION_DATE_CREATE = createField(DSL.name("decision_date_create"), SQLDataType.TIMESTAMP(0), this, "дата решения о применении временной меры"); + + /** + * The column + * ervu_dashboard.temporary_measures.decision_date_cancel. дата + * решения об отмене временной меры + */ + public final TableField DECISION_DATE_CANCEL = createField(DSL.name("decision_date_cancel"), SQLDataType.TIMESTAMP(0), this, "дата решения об отмене временной меры"); + + /** + * The column ervu_dashboard.temporary_measures.applied_fact. + * факт применения временной меры + */ + public final TableField APPLIED_FACT = createField(DSL.name("applied_fact"), SQLDataType.CLOB, this, "факт применения временной меры"); private TemporaryMeasures(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenRecord.java index 0e483a65..4c9c553c 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenRecord.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenRecord.java @@ -593,15 +593,15 @@ public class CitizenRecord extends UpdatableRecordImpl { /** * Setter for ervu_dashboard.citizen.recruitment_id. */ - public void setRecruitmentId(String value) { + public void setRecruitmentId(UUID value) { set(37, value); } /** * Getter for ervu_dashboard.citizen.recruitment_id. */ - public String getRecruitmentId() { - return (String) get(37); + public UUID getRecruitmentId() { + return (UUID) get(37); } /** @@ -655,7 +655,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, String recruitmentId, Date issueDate, BigDecimal numberChildren_18Old) { + 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) { super(Citizen.CITIZEN); setResidence(residence); diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/DecisionRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/DecisionRecord.java new file mode 100644 index 00000000..8d0fd5e0 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/DecisionRecord.java @@ -0,0 +1,111 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records; + + +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Decision; + +import java.util.UUID; + +import org.jooq.Record1; +import org.jooq.impl.UpdatableRecordImpl; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class DecisionRecord extends UpdatableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for ervu_dashboard.decision.decision_id. + */ + public void setDecisionId(Long value) { + set(0, value); + } + + /** + * Getter for ervu_dashboard.decision.decision_id. + */ + public Long getDecisionId() { + return (Long) get(0); + } + + /** + * Setter for ervu_dashboard.decision.subpoena_id. + */ + public void setSubpoenaId(UUID value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.decision.subpoena_id. + */ + public UUID getSubpoenaId() { + return (UUID) get(1); + } + + /** + * Setter for ervu_dashboard.decision.recruit_id. + */ + public void setRecruitId(UUID value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.decision.recruit_id. + */ + public UUID getRecruitId() { + return (UUID) get(2); + } + + /** + * Setter for ervu_dashboard.decision.recruitment_id. + */ + public void setRecruitmentId(UUID value) { + set(3, value); + } + + /** + * Getter for ervu_dashboard.decision.recruitment_id. + */ + public UUID getRecruitmentId() { + return (UUID) get(3); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 key() { + return (Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached DecisionRecord + */ + public DecisionRecord() { + super(Decision.DECISION); + } + + /** + * Create a detached, initialised DecisionRecord + */ + public DecisionRecord(Long decisionId, UUID subpoenaId, UUID recruitId, UUID recruitmentId) { + super(Decision.DECISION); + + setDecisionId(decisionId); + setSubpoenaId(subpoenaId); + setRecruitId(recruitId); + setRecruitmentId(recruitmentId); + resetChangedOnNotNull(); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/RecruitmentRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/RecruitmentRecord.java index c40726dc..8a7ae183 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/RecruitmentRecord.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/RecruitmentRecord.java @@ -6,6 +6,8 @@ package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Recruitment; +import java.util.UUID; + import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; @@ -49,15 +51,15 @@ public class RecruitmentRecord extends UpdatableRecordImpl { /** * Setter for ervu_dashboard.recruitment.idm_id. */ - public void setIdmId(String value) { + public void setIdmId(UUID value) { set(2, value); } /** * Getter for ervu_dashboard.recruitment.idm_id. */ - public String getIdmId() { - return (String) get(2); + public UUID getIdmId() { + return (UUID) get(2); } /** @@ -125,7 +127,7 @@ public class RecruitmentRecord extends UpdatableRecordImpl { /** * Create a detached, initialised RecruitmentRecord */ - public RecruitmentRecord(String id, String shortname, String idmId, String code, String parentId, Long sort) { + public RecruitmentRecord(String id, String shortname, UUID idmId, String code, String parentId, Long sort) { super(Recruitment.RECRUITMENT); setId(id); diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/SubpoenaRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/SubpoenaRecord.java index 61ab235f..ecae847d 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/SubpoenaRecord.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/SubpoenaRecord.java @@ -14,7 +14,7 @@ import org.jooq.impl.UpdatableRecordImpl; /** - * This class is generated by jOOQ. + * сведения о направлении повестки военного комиссариата */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class SubpoenaRecord extends UpdatableRecordImpl { @@ -22,112 +22,122 @@ public class SubpoenaRecord extends UpdatableRecordImpl { private static final long serialVersionUID = 1L; /** - * Setter for ervu_dashboard.subpoena.subpoena_id. + * Setter for ervu_dashboard.subpoena.sub_id. */ - public void setSubpoenaId(Long value) { + public void setSubId(Long value) { set(0, value); } /** - * Getter for ervu_dashboard.subpoena.subpoena_id. + * Getter for ervu_dashboard.subpoena.sub_id. */ - public Long getSubpoenaId() { + public Long getSubId() { return (Long) get(0); } /** - * Setter for ervu_dashboard.subpoena.series. + * Setter for ervu_dashboard.subpoena.series. серия повестки */ public void setSeries(String value) { set(1, value); } /** - * Getter for ervu_dashboard.subpoena.series. + * Getter for ervu_dashboard.subpoena.series. серия повестки */ public String getSeries() { return (String) get(1); } /** - * Setter for ervu_dashboard.subpoena.number. + * Setter for ervu_dashboard.subpoena.number. номер повестки */ public void setNumber(String value) { set(2, value); } /** - * Getter for ervu_dashboard.subpoena.number. + * Getter for ervu_dashboard.subpoena.number. номер повестки */ public String getNumber() { return (String) get(2); } /** - * Setter for ervu_dashboard.subpoena.create_date. + * Setter for ervu_dashboard.subpoena.create_date. дата + * создания записи */ public void setCreateDate(Timestamp value) { set(3, value); } /** - * Getter for ervu_dashboard.subpoena.create_date. + * Getter for ervu_dashboard.subpoena.create_date. дата + * создания записи */ public Timestamp getCreateDate() { return (Timestamp) get(3); } /** - * Setter for ervu_dashboard.subpoena.visit_date. + * Setter for ervu_dashboard.subpoena.visit_date. время и дата + * явки в ВК */ public void setVisitDate(Timestamp value) { set(4, value); } /** - * Getter for ervu_dashboard.subpoena.visit_date. + * Getter for ervu_dashboard.subpoena.visit_date. время и дата + * явки в ВК */ public Timestamp getVisitDate() { return (Timestamp) get(4); } /** - * Setter for ervu_dashboard.subpoena.send_date. + * Setter for ervu_dashboard.subpoena.send_date. дата + * направления повестки */ public void setSendDate(Timestamp value) { set(5, value); } /** - * Getter for ervu_dashboard.subpoena.send_date. + * Getter for ervu_dashboard.subpoena.send_date. дата + * направления повестки */ public Timestamp getSendDate() { return (Timestamp) get(5); } /** - * Setter for ervu_dashboard.subpoena.reason_cancelled. + * Setter for ervu_dashboard.subpoena.reason_cancelled. причина + * отклонения повестки */ public void setReasonCancelled(String value) { set(6, value); } /** - * Getter for ervu_dashboard.subpoena.reason_cancelled. + * Getter for ervu_dashboard.subpoena.reason_cancelled. причина + * отклонения повестки */ public String getReasonCancelled() { return (String) get(6); } /** - * Setter for ervu_dashboard.subpoena.recruit_id. + * Setter for ervu_dashboard.subpoena.recruit_id. идентификатор + * рекрута */ public void setRecruitId(UUID value) { set(7, value); } /** - * Getter for ervu_dashboard.subpoena.recruit_id. + * Getter for ervu_dashboard.subpoena.recruit_id. идентификатор + * рекрута */ public UUID getRecruitId() { return (UUID) get(7); @@ -135,6 +145,7 @@ public class SubpoenaRecord extends UpdatableRecordImpl { /** * Setter for ervu_dashboard.subpoena.department_id. + * идентификатор ВК */ public void setDepartmentId(UUID value) { set(8, value); @@ -142,39 +153,258 @@ public class SubpoenaRecord extends UpdatableRecordImpl { /** * Getter for ervu_dashboard.subpoena.department_id. + * идентификатор ВК */ public UUID getDepartmentId() { return (UUID) get(8); } /** - * Setter for ervu_dashboard.subpoena.subpoena_status. + * Setter for ervu_dashboard.subpoena.subpoena_status. статус + * повестки */ public void setSubpoenaStatus(String value) { set(9, value); } /** - * Getter for ervu_dashboard.subpoena.subpoena_status. + * Getter for ervu_dashboard.subpoena.subpoena_status. статус + * повестки */ public String getSubpoenaStatus() { return (String) get(9); } /** - * Setter for ervu_dashboard.subpoena.subpoena_reason. + * Setter for ervu_dashboard.subpoena.subpoena_reason. причина + * вызова по повестке */ public void setSubpoenaReason(String value) { set(10, value); } /** - * Getter for ervu_dashboard.subpoena.subpoena_reason. + * Getter for ervu_dashboard.subpoena.subpoena_reason. причина + * вызова по повестке */ public String getSubpoenaReason() { return (String) get(10); } + /** + * Setter for ervu_dashboard.subpoena.fio_commiss. фио + * комиссара + */ + public void setFioCommiss(String value) { + set(11, value); + } + + /** + * Getter for ervu_dashboard.subpoena.fio_commiss. фио + * комиссара + */ + public String getFioCommiss() { + return (String) get(11); + } + + /** + * Setter for ervu_dashboard.subpoena.track_number. уникальный + * номер заказного почтового отправления, которым направлена повестка + */ + public void setTrackNumber(String value) { + set(12, value); + } + + /** + * Getter for ervu_dashboard.subpoena.track_number. уникальный + * номер заказного почтового отправления, которым направлена повестка + */ + public String getTrackNumber() { + return (String) get(12); + } + + /** + * Setter for ervu_dashboard.subpoena.recruitment_name. + * наименование ВК, направившего повестку + */ + public void setRecruitmentName(String value) { + set(13, value); + } + + /** + * Getter for ervu_dashboard.subpoena.recruitment_name. + * наименование ВК, направившего повестку + */ + public String getRecruitmentName() { + return (String) get(13); + } + + /** + * Setter for ervu_dashboard.subpoena.address. адрес, по + * которому нужно явиться по повестке + */ + public void setAddress(String value) { + set(14, value); + } + + /** + * Getter for ervu_dashboard.subpoena.address. адрес, по + * которому нужно явиться по повестке + */ + public String getAddress() { + return (String) get(14); + } + + /** + * Setter for ervu_dashboard.subpoena.method_sending. способ + * направления повестки + */ + public void setMethodSending(String value) { + set(15, value); + } + + /** + * Getter for ervu_dashboard.subpoena.method_sending. способ + * направления повестки + */ + public String getMethodSending() { + return (String) get(15); + } + + /** + * Setter for ervu_dashboard.subpoena.subpoena_id. + * идентификатор повестки + */ + public void setSubpoenaId(UUID value) { + set(16, value); + } + + /** + * Getter for ervu_dashboard.subpoena.subpoena_id. + * идентификатор повестки + */ + public UUID getSubpoenaId() { + return (UUID) get(16); + } + + /** + * Setter for ervu_dashboard.subpoena.sig_info. открепленная ЭП + */ + public void setSigInfo(String value) { + set(17, value); + } + + /** + * Getter for ervu_dashboard.subpoena.sig_info. открепленная ЭП + */ + public String getSigInfo() { + return (String) get(17); + } + + /** + * Setter for ervu_dashboard.subpoena.delivery_fio. фио лица, + * оповестившего гражданина о последствиях отказа от получения повестки + */ + public void setDeliveryFio(String value) { + set(18, value); + } + + /** + * Getter for ervu_dashboard.subpoena.delivery_fio. фио лица, + * оповестившего гражданина о последствиях отказа от получения повестки + */ + public String getDeliveryFio() { + return (String) get(18); + } + + /** + * Setter for ervu_dashboard.subpoena.act_number. номер акта об + * отказе от получения повестки + */ + public void setActNumber(String value) { + set(19, value); + } + + /** + * Getter for ervu_dashboard.subpoena.act_number. номер акта об + * отказе от получения повестки + */ + public String getActNumber() { + return (String) get(19); + } + + /** + * Setter for ervu_dashboard.subpoena.method_delivery. способ + * вручения + */ + public void setMethodDelivery(String value) { + set(20, value); + } + + /** + * Getter for ervu_dashboard.subpoena.method_delivery. способ + * вручения + */ + public String getMethodDelivery() { + return (String) get(20); + } + + /** + * Setter for ervu_dashboard.subpoena.delivery_date. + */ + public void setDeliveryDate(Timestamp value) { + set(21, value); + } + + /** + * Getter for ervu_dashboard.subpoena.delivery_date. + */ + public Timestamp getDeliveryDate() { + return (Timestamp) get(21); + } + + /** + * Setter for ervu_dashboard.subpoena.delivery_status. + */ + public void setDeliveryStatus(String value) { + set(22, value); + } + + /** + * Getter for ervu_dashboard.subpoena.delivery_status. + */ + public String getDeliveryStatus() { + return (String) get(22); + } + + /** + * Setter for ervu_dashboard.subpoena.appearance. + */ + public void setAppearance(String value) { + set(23, value); + } + + /** + * Getter for ervu_dashboard.subpoena.appearance. + */ + public String getAppearance() { + return (String) get(23); + } + + /** + * Setter for ervu_dashboard.subpoena.appearance_status. + */ + public void setAppearanceStatus(String value) { + set(24, value); + } + + /** + * Getter for ervu_dashboard.subpoena.appearance_status. + */ + public String getAppearanceStatus() { + return (String) get(24); + } + // ------------------------------------------------------------------------- // Primary key information // ------------------------------------------------------------------------- @@ -198,10 +428,10 @@ public class SubpoenaRecord extends UpdatableRecordImpl { /** * Create a detached, initialised SubpoenaRecord */ - public SubpoenaRecord(Long subpoenaId, String series, String number, Timestamp createDate, Timestamp visitDate, Timestamp sendDate, String reasonCancelled, UUID recruitId, UUID departmentId, String subpoenaStatus, String subpoenaReason) { + 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) { super(Subpoena.SUBPOENA); - setSubpoenaId(subpoenaId); + setSubId(subId); setSeries(series); setNumber(number); setCreateDate(createDate); @@ -212,6 +442,20 @@ public class SubpoenaRecord extends UpdatableRecordImpl { setDepartmentId(departmentId); setSubpoenaStatus(subpoenaStatus); setSubpoenaReason(subpoenaReason); + setFioCommiss(fioCommiss); + setTrackNumber(trackNumber); + setRecruitmentName(recruitmentName); + setAddress(address); + setMethodSending(methodSending); + setSubpoenaId(subpoenaId); + setSigInfo(sigInfo); + setDeliveryFio(deliveryFio); + setActNumber(actNumber); + setMethodDelivery(methodDelivery); + setDeliveryDate(deliveryDate); + setDeliveryStatus(deliveryStatus); + setAppearance(appearance); + setAppearanceStatus(appearanceStatus); resetChangedOnNotNull(); } } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/TemporaryMeasuresRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/TemporaryMeasuresRecord.java index 63dcb70c..3cd87b39 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/TemporaryMeasuresRecord.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/TemporaryMeasuresRecord.java @@ -6,7 +6,7 @@ package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.TemporaryMeasures; -import java.sql.Date; +import java.sql.Timestamp; import java.util.UUID; import org.jooq.Record1; @@ -37,92 +37,218 @@ public class TemporaryMeasuresRecord extends UpdatableRecordImplervu_dashboard.temporary_measures.subpoena_id. + */ + public void setSubpoenaId(UUID value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.temporary_measures.subpoena_id. + */ + public UUID getSubpoenaId() { + return (UUID) get(1); + } + + /** + * Setter for ervu_dashboard.temporary_measures.recruit_id. + */ + public void setRecruitId(UUID value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.temporary_measures.recruit_id. + */ + public UUID getRecruitId() { + return (UUID) get(2); + } + /** * Setter for ervu_dashboard.temporary_measures.recruitment_id. */ - public void setRecruitmentId(String value) { - set(1, value); + public void setRecruitmentId(UUID value) { + set(3, value); } /** * Getter for ervu_dashboard.temporary_measures.recruitment_id. */ - public String getRecruitmentId() { - return (String) get(1); + public UUID getRecruitmentId() { + return (UUID) get(3); } /** - * Setter for ervu_dashboard.temporary_measures.name. + * Setter for ervu_dashboard.temporary_measures.status_measure. + * статус временной меры */ - public void setName(String value) { - set(2, value); - } - - /** - * Getter for ervu_dashboard.temporary_measures.name. - */ - public String getName() { - return (String) get(2); - } - - /** - * Setter for - * ervu_dashboard.temporary_measures.date_application. - */ - public void setDateApplication(Date value) { - set(3, value); - } - - /** - * Getter for - * ervu_dashboard.temporary_measures.date_application. - */ - public Date getDateApplication() { - return (Date) get(3); - } - - /** - * Setter for - * ervu_dashboard.temporary_measures.withdrawal_date. - */ - public void setWithdrawalDate(Date value) { + public void setStatusMeasure(String value) { set(4, value); } /** - * Getter for - * ervu_dashboard.temporary_measures.withdrawal_date. + * Getter for ervu_dashboard.temporary_measures.status_measure. + * статус временной меры */ - public Date getWithdrawalDate() { - return (Date) get(4); + public String getStatusMeasure() { + return (String) get(4); } /** - * Setter for ervu_dashboard.temporary_measures.status. + * Setter for + * ervu_dashboard.temporary_measures.recruitment_name. + * наименование ВК */ - public void setStatus(String value) { + public void setRecruitmentName(String value) { set(5, value); } /** - * Getter for ervu_dashboard.temporary_measures.status. + * Getter for + * ervu_dashboard.temporary_measures.recruitment_name. + * наименование ВК */ - public String getStatus() { + public String getRecruitmentName() { return (String) get(5); } /** - * Setter for ervu_dashboard.temporary_measures.citizen_id. + * Setter for ervu_dashboard.temporary_measures.cancel_date. + * дата, с которой отменена временная мера */ - public void setCitizenId(UUID value) { + public void setCancelDate(Timestamp value) { set(6, value); } /** - * Getter for ervu_dashboard.temporary_measures.citizen_id. + * Getter for ervu_dashboard.temporary_measures.cancel_date. + * дата, с которой отменена временная мера */ - public UUID getCitizenId() { - return (UUID) get(6); + public Timestamp getCancelDate() { + return (Timestamp) get(6); + } + + /** + * Setter for + * ervu_dashboard.temporary_measures.restriction_name. + * наименование временной меры + */ + public void setRestrictionName(String value) { + set(7, value); + } + + /** + * Getter for + * ervu_dashboard.temporary_measures.restriction_name. + * наименование временной меры + */ + public String getRestrictionName() { + return (String) get(7); + } + + /** + * Setter for ervu_dashboard.temporary_measures.type. тип + * документа ограничения + */ + public void setType(String value) { + set(8, value); + } + + /** + * Getter for ervu_dashboard.temporary_measures.type. тип + * документа ограничения + */ + public String getType() { + return (String) get(8); + } + + /** + * Setter for + * ervu_dashboard.temporary_measures.decision_number_create. + * номер решения о применении временной меры + */ + public void setDecisionNumberCreate(String value) { + set(9, value); + } + + /** + * Getter for + * ervu_dashboard.temporary_measures.decision_number_create. + * номер решения о применении временной меры + */ + public String getDecisionNumberCreate() { + return (String) get(9); + } + + /** + * Setter for + * ervu_dashboard.temporary_measures.decision_number_cancel. + * номер решения об отмене временной меры + */ + public void setDecisionNumberCancel(String value) { + set(10, value); + } + + /** + * Getter for + * ervu_dashboard.temporary_measures.decision_number_cancel. + * номер решения об отмене временной меры + */ + public String getDecisionNumberCancel() { + return (String) get(10); + } + + /** + * Setter for + * ervu_dashboard.temporary_measures.decision_date_create. дата + * решения о применении временной меры + */ + public void setDecisionDateCreate(Timestamp value) { + set(11, value); + } + + /** + * Getter for + * ervu_dashboard.temporary_measures.decision_date_create. дата + * решения о применении временной меры + */ + public Timestamp getDecisionDateCreate() { + return (Timestamp) get(11); + } + + /** + * Setter for + * ervu_dashboard.temporary_measures.decision_date_cancel. дата + * решения об отмене временной меры + */ + public void setDecisionDateCancel(Timestamp value) { + set(12, value); + } + + /** + * Getter for + * ervu_dashboard.temporary_measures.decision_date_cancel. дата + * решения об отмене временной меры + */ + public Timestamp getDecisionDateCancel() { + return (Timestamp) get(12); + } + + /** + * Setter for ervu_dashboard.temporary_measures.applied_fact. + * факт применения временной меры + */ + public void setAppliedFact(String value) { + set(13, value); + } + + /** + * Getter for ervu_dashboard.temporary_measures.applied_fact. + * факт применения временной меры + */ + public String getAppliedFact() { + return (String) get(13); } // ------------------------------------------------------------------------- @@ -148,16 +274,23 @@ public class TemporaryMeasuresRecord extends UpdatableRecordImpl