diff --git a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Keys.java b/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Keys.java index 090b1f07..bd83c472 100644 --- a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Keys.java +++ b/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Keys.java @@ -5,7 +5,9 @@ package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_; import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.InteractionLog; +import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OrgOkved; import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.InteractionLogRecord; +import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.OrgOkvedRecord; import org.jooq.TableField; import org.jooq.UniqueKey; @@ -25,4 +27,5 @@ public class Keys { // ------------------------------------------------------------------------- public static final UniqueKey INTERACTION_LOG_PKEY = Internal.createUniqueKey(InteractionLog.INTERACTION_LOG, DSL.name("interaction_log_pkey"), new TableField[] { InteractionLog.INTERACTION_LOG.ID }, true); + public static final UniqueKey ORG_OKVED_PKEY = Internal.createUniqueKey(OrgOkved.ORG_OKVED, DSL.name("org_okved_pkey"), new TableField[] { OrgOkved.ORG_OKVED.ID }, true); } diff --git a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Public.java b/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Public.java index b582099b..5da7ba83 100644 --- a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Public.java +++ b/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Public.java @@ -6,6 +6,7 @@ package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_; import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.DefaultCatalog; import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.InteractionLog; +import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OrgOkved; import java.util.Arrays; import java.util.List; @@ -33,6 +34,11 @@ public class Public extends SchemaImpl { */ public final InteractionLog INTERACTION_LOG = InteractionLog.INTERACTION_LOG; + /** + * The table public.org_okved. + */ + public final OrgOkved ORG_OKVED = OrgOkved.ORG_OKVED; + /** * No further instances allowed */ @@ -49,7 +55,8 @@ public class Public extends SchemaImpl { @Override public final List> getTables() { return Arrays.asList( - InteractionLog.INTERACTION_LOG + InteractionLog.INTERACTION_LOG, + OrgOkved.ORG_OKVED ); } } diff --git a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Tables.java b/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Tables.java index ecfe3a8c..9b2926fd 100644 --- a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Tables.java +++ b/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Tables.java @@ -5,6 +5,7 @@ package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_; import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.InteractionLog; +import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OrgOkved; /** @@ -17,4 +18,9 @@ public class Tables { * The table public.interaction_log. */ public static final InteractionLog INTERACTION_LOG = InteractionLog.INTERACTION_LOG; + + /** + * The table public.org_okved. + */ + public static final OrgOkved ORG_OKVED = OrgOkved.ORG_OKVED; } diff --git a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/OrgOkved.java b/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/OrgOkved.java new file mode 100644 index 00000000..ba8d15a1 --- /dev/null +++ b/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/OrgOkved.java @@ -0,0 +1,244 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables; + + +import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Keys; +import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Public; +import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.OrgOkvedRecord; + +import java.util.Collection; + +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 OrgOkved extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of public.org_okved + */ + public static final OrgOkved ORG_OKVED = new OrgOkved(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return OrgOkvedRecord.class; + } + + /** + * The column public.org_okved.id. + */ + public final TableField ID = createField(DSL.name("id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + /** + * The column public.org_okved.code. + */ + public final TableField CODE = createField(DSL.name("code"), SQLDataType.VARCHAR(7), this, ""); + + /** + * The column public.org_okved.okved. + */ + public final TableField OKVED = createField(DSL.name("okved"), SQLDataType.CLOB, this, ""); + + /** + * The column public.org_okved.organization. + */ + public final TableField ORGANIZATION = createField(DSL.name("organization"), SQLDataType.CLOB, this, ""); + + /** + * The column public.org_okved.main_okved. + */ + public final TableField MAIN_OKVED = createField(DSL.name("main_okved"), SQLDataType.BOOLEAN, this, ""); + + private OrgOkved(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private OrgOkved(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where); + } + + /** + * Create an aliased public.org_okved table reference + */ + public OrgOkved(String alias) { + this(DSL.name(alias), ORG_OKVED); + } + + /** + * Create an aliased public.org_okved table reference + */ + public OrgOkved(Name alias) { + this(alias, ORG_OKVED); + } + + /** + * Create a public.org_okved table reference + */ + public OrgOkved() { + this(DSL.name("org_okved"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : Public.PUBLIC; + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public UniqueKey getPrimaryKey() { + return Keys.ORG_OKVED_PKEY; + } + + @Override + public OrgOkved as(String alias) { + return new OrgOkved(DSL.name(alias), this); + } + + @Override + public OrgOkved as(Name alias) { + return new OrgOkved(alias, this); + } + + @Override + public OrgOkved as(Table alias) { + return new OrgOkved(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public OrgOkved rename(String name) { + return new OrgOkved(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public OrgOkved rename(Name name) { + return new OrgOkved(name, null); + } + + /** + * Rename this table + */ + @Override + public OrgOkved rename(Table name) { + return new OrgOkved(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public OrgOkved where(Condition condition) { + return new OrgOkved(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public OrgOkved where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public OrgOkved where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public OrgOkved where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public OrgOkved where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public OrgOkved where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public OrgOkved where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public OrgOkved where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public OrgOkved whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public OrgOkved whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} diff --git a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/records/OrgOkvedRecord.java b/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/records/OrgOkvedRecord.java new file mode 100644 index 00000000..7570d690 --- /dev/null +++ b/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/records/OrgOkvedRecord.java @@ -0,0 +1,124 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records; + + +import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OrgOkved; + +import org.jooq.Record1; +import org.jooq.impl.UpdatableRecordImpl; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class OrgOkvedRecord extends UpdatableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for public.org_okved.id. + */ + public void setId(Long value) { + set(0, value); + } + + /** + * Getter for public.org_okved.id. + */ + public Long getId() { + return (Long) get(0); + } + + /** + * Setter for public.org_okved.code. + */ + public void setCode(String value) { + set(1, value); + } + + /** + * Getter for public.org_okved.code. + */ + public String getCode() { + return (String) get(1); + } + + /** + * Setter for public.org_okved.okved. + */ + public void setOkved(String value) { + set(2, value); + } + + /** + * Getter for public.org_okved.okved. + */ + public String getOkved() { + return (String) get(2); + } + + /** + * Setter for public.org_okved.organization. + */ + public void setOrganization(String value) { + set(3, value); + } + + /** + * Getter for public.org_okved.organization. + */ + public String getOrganization() { + return (String) get(3); + } + + /** + * Setter for public.org_okved.main_okved. + */ + public void setMainOkved(Boolean value) { + set(4, value); + } + + /** + * Getter for public.org_okved.main_okved. + */ + public Boolean getMainOkved() { + return (Boolean) get(4); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 key() { + return (Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached OrgOkvedRecord + */ + public OrgOkvedRecord() { + super(OrgOkved.ORG_OKVED); + } + + /** + * Create a detached, initialised OrgOkvedRecord + */ + public OrgOkvedRecord(Long id, String code, String okved, String organization, Boolean mainOkved) { + super(OrgOkved.ORG_OKVED); + + setId(id); + setCode(code); + setOkved(okved); + setOrganization(organization); + setMainOkved(mainOkved); + resetChangedOnNotNull(); + } +} diff --git a/resources/src/main/resources/business-model/Информация об организации.page b/resources/src/main/resources/business-model/Информация об организации.page index a0f1f831..afd906bc 100644 --- a/resources/src/main/resources/business-model/Информация об организации.page +++ b/resources/src/main/resources/business-model/Информация об организации.page @@ -117,7 +117,6 @@ 3ed7cd92-3c7a-4d6f-a22c-1f3c4031bb61 VB - левый true - false false @@ -174,13 +173,6 @@ - - 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 - 9712b7a5-eb4c-4cab-a8dc-2c34e9b0d3f7 - VB - true - true - 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 ab77b5e7-503a-4bb9-ad3e-a6bec053a0b0 @@ -411,13 +403,6 @@ - - 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 - e9bffe2a-93ee-4512-89f8-d6da27038c97 - VB - true - true - 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 9b24887e-d260-47f5-a2f9-47050ec1f9ed @@ -833,13 +818,6 @@ false - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 218a14f3-e21c-4494-ad83-ac7a6357a80f - Данные организации - false - true - 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 @@ -1085,12 +1063,248 @@ false - + + 16071adb-3bdf-4c33-b29b-886876016415 + 2cd4fdd3-7a68-4f2e-b2c9-468ca83ed63a + Таблица + true + false + + + + autoStretchColumns + + true + + + + cssClasses + + + + "okved-list" + + + + + + + + + + gridService + + + + loadDao + + + +graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"org_okved","schemaName":"public","x":387.20000000000005,"y":282.4,"alias":"org_okved","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"org_okved","entity":"org_okved","name":"main_okved"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"org_okved","schemaName":"public","x":387.20000000000005,"y":282.4,"alias":"org_okved","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"org_okved","entity":"org_okved","name":"main_okved"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"org_okved":{"tableName":"org_okved","schemaName":"public","x":387.20000000000005,"y":282.4,"alias":"org_okved","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"org_okved","entity":"org_okved","name":"main_okved"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + + + + + + + + +364c8faa-5e56-46cd-9203-d2ec6ef2dc74 +a198d8e0-5886-4b86-a32e-cccbbf86f268 +Столбец +false +false + + + + + displayColumns + + + + + +entityColumn + + {"schema":"public","table":"org_okved","entity":"org_okved","name":"code"} + + + +postfix + + " " + + + + + + + + + +entityColumn + + {"schema":"public","table":"org_okved","entity":"org_okved","name":"okved"} + + + + + + + + + displayType + + "MULTI_COLUMN" + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 - f9c85b8c-2500-4b1d-bbcf-092092f17267 - Почтовый адрес + 19126951-2acd-4b6c-b576-2fbc82e288c3 + Дополнительные виды деятельности false - true + false + + + + cssClasses + + + + "font-bold" + + + + + + initialValue + + "Дополнительные виды деятельности" + + + + + + + + +false + + + + 16071adb-3bdf-4c33-b29b-886876016415 + efdeabec-a4db-4a71-b923-13af7581eff1 + Таблица + true + false + + + + autoStretchColumns + + true + + + + cssClasses + + + + "okved-list" + + + + + + + + + + gridService + + + + loadDao + + + +graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"org_okved","schemaName":"public","x":387.20000000000005,"y":282.4,"alias":"org_okved","conditionGroup":{"operator":"OR","conditions":[{"column":{"schema":"public","table":"org_okved","entity":"org_okved","name":"main_okved"},"operation":"EQUAL","typeCode":"CONST","values":["false"]},{"column":{"schema":"public","table":"org_okved","entity":"org_okved","name":"main_okved"},"operation":"IS_NULL","typeCode":"CONST","values":[null]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"org_okved","schemaName":"public","x":387.20000000000005,"y":282.4,"alias":"org_okved","conditionGroup":{"operator":"OR","conditions":[{"column":{"schema":"public","table":"org_okved","entity":"org_okved","name":"main_okved"},"operation":"EQUAL","typeCode":"CONST","values":["false"]},{"column":{"schema":"public","table":"org_okved","entity":"org_okved","name":"main_okved"},"operation":"IS_NULL","typeCode":"CONST","values":[null]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"org_okved":{"tableName":"org_okved","schemaName":"public","x":387.20000000000005,"y":282.4,"alias":"org_okved","conditionGroup":{"operator":"OR","conditions":[{"column":{"schema":"public","table":"org_okved","entity":"org_okved","name":"main_okved"},"operation":"EQUAL","typeCode":"CONST","values":["false"]},{"column":{"schema":"public","table":"org_okved","entity":"org_okved","name":"main_okved"},"operation":"IS_NULL","typeCode":"CONST","values":[null]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + + + + + + + + +364c8faa-5e56-46cd-9203-d2ec6ef2dc74 +efc6f03c-2dda-4f18-9486-184b2437d76d +Столбец +false +false + + + + + displayColumns + + + + + +entityColumn + + {"schema":"public","table":"org_okved","entity":"org_okved","name":"code"} + + + +postfix + + " " + + + + + + + + + +entityColumn + + {"schema":"public","table":"org_okved","entity":"org_okved","name":"okved"} + + + + + + + + + displayType + + "MULTI_COLUMN" + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d @@ -1099,13 +1313,6 @@ true true - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 07ce2296-3c91-4887-aa46-fd79cad082c8 - Почтовый адрес - false - true - @@ -1141,13 +1348,6 @@ - - f7504fc9-f501-43fe-a678-5c6ba756ba5c - e173df16-9759-4708-b9da-041722b87810 - FS - (количество дней до явки в военкомат) - true - true - f7504fc9-f501-43fe-a678-5c6ba756ba5c 51cdc197-5c6b-411a-95b3-2833045a7c96